From 3d226093858bc6b927b2eb74163dcdd26aa14650 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 5 Jan 2012 01:44:40 +0100 Subject: 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 --- Bugzilla/WebService/Server/JSONRPC.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Bugzilla') 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; -- cgit v1.2.3-24-g4f1b