From 74b8cef885e2ea1667b3e03f4aac4b3876fdfd59 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 19 Aug 2013 11:38:09 +0800
Subject: Bug 905948: under mod_perl, HTTP/200 is returned when etags match
 If-None-Match r=dkl, a=glob

---
 mod_perl.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'mod_perl.pl')

diff --git a/mod_perl.pl b/mod_perl.pl
index 1f4593f00..572bcc7f9 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -135,9 +135,10 @@ sub handler : method {
     Bugzilla::init_page();
     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
+    # When returning data from the REST api we must only return 200 or 304,
+    # which tells Apache not to append its error html documents to the
+    # response.
+    return Bugzilla->usage_mode == USAGE_MODE_REST && $result != 304
            ? Apache2::Const::OK
            : $result;
 }
-- 
cgit v1.2.3-24-g4f1b