summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-01-05 01:44:40 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2012-01-05 01:44:40 +0100
commit3d226093858bc6b927b2eb74163dcdd26aa14650 (patch)
treea15595ddad8193a78b2d7998a2abd439c17fb737
parenta7785661b8e7dcb7a6914eebf1a11fd99f1cf037 (diff)
downloadbugzilla-3d226093858bc6b927b2eb74163dcdd26aa14650.tar.gz
bugzilla-3d226093858bc6b927b2eb74163dcdd26aa14650.tar.xz
Bug 706753: Bugzilla will not work with newest version of JSON::RPC 1.01 due to non-backward compatibility
r=dkl r=mkanat a=LpSolit
-rw-r--r--Bugzilla/WebService/Server/JSONRPC.pm13
1 files changed, 12 insertions, 1 deletions
diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index 8fe724080..3b232aafa 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -22,7 +22,18 @@
package Bugzilla::WebService::Server::JSONRPC;
use strict;
-use base qw(JSON::RPC::Server::CGI Bugzilla::WebService::Server);
+use Bugzilla::WebService::Server;
+BEGIN {
+ our @ISA = qw(Bugzilla::WebService::Server);
+
+ if (eval { require JSON::RPC::Server::CGI }) {
+ unshift(@ISA, 'JSON::RPC::Server::CGI');
+ }
+ else {
+ require JSON::RPC::Legacy::Server::CGI;
+ unshift(@ISA, 'JSON::RPC::Legacy::Server::CGI');
+ }
+}
use Bugzilla::Error;
use Bugzilla::WebService::Constants;