From: Byron Jones <bjones@mozilla.com>
Date: Mon, 22 Jul 2013 05:14:38 +0000 (+0800)
Subject: Bug 895306: REST endpoint returns both JSON and HTML errors when running under mod_perl
X-Git-Tag: bugzilla-4.5.1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca9d0d9120c56b0aa3c3cadcb4759768140cc947;p=thirdparty%2Fbugzilla.git

Bug 895306: REST endpoint returns both JSON and HTML errors when running under mod_perl
r=dkl, a=glob
---

diff --git a/mod_perl.pl b/mod_perl.pl
index 20b9746f39..1f4593f009 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -115,6 +115,7 @@ use strict;
 
 use parent qw(ModPerl::Registry);
 use Bugzilla;
+use Bugzilla::Constants qw(USAGE_MODE_REST);
 
 sub handler : method {
     my $class = shift;
@@ -132,7 +133,13 @@ sub handler : method {
     use warnings;
 
     Bugzilla::init_page();
-    return $class->SUPER::handler(@_);
+    my $result = $class->SUPER::handler(@_);
+
+    # When returning data from the REST api, tell Apache not to append its
+    # error html documents to the response.
+    return Bugzilla->usage_mode == USAGE_MODE_REST
+           ? Apache2::Const::OK
+           : $result;
 }