Make JSON non-required module

interchange · Dec 30, 2014 · 75bf32b · 75bf32b
1 parent 59dd4cd
commit 75bf32b
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/lib/Vend/Server.pm b/lib/Vend/Server.pm
@@ -23,7 +23,7 @@
 
 package Vend::Server;
 
-use vars qw($VERSION);
+use vars qw($VERSION $Has_JSON);
 $VERSION = '2.107';
 
 use Cwd;
@@ -35,9 +35,18 @@ use Errno qw/:POSIX/;
 use Config;
 use Socket;
 use Symbol;
-use JSON ();
 use strict;
 
+{
+    local $@;
+    eval {
+        require JSON;
+    };
+    unless ($@) {
+        $Has_JSON = 1;
+    }
+}
+
 no warnings qw(uninitialized);
 
 my $ppidsub = sub { return getppid };
@@ -323,13 +332,13 @@ sub parse_cgi {
 		if ($CGI::content_type =~ m{^(?:multipart/form-data|application/x-www-form-urlencoded|application/xml|application/json)\b}i) {
 			parse_post(\$CGI::query_string, 1)
 				if $Global::TolerateGet;
-			if ($CGI::content_type =~ m{^application/json\s*(?:;|$)}i) {
+			if ($Has_JSON && $CGI::content_type =~ m{^application/json\s*(?:;|$)}i) {
 				$CGI::post_ref = $h->{entity};
 				undef $CGI::json_ref;
 				eval {
 					$CGI::json_ref = JSON::from_json($$CGI::post_ref);
 #::logDebug('json: %s', ::uneval($CGI::json_ref));
-					# populate CGI from json_ref; maybe make a directive?
+
 					if ($Global::UnpackJSON && ref $CGI::json_ref eq 'HASH') {
 						@CGI::values{keys %$CGI::json_ref} = values %$CGI::json_ref;
 					}