From 1ed8e326cdb55256fc829102e46b3029b0f39202 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 19 Aug 2013 11:36:30 +0800
Subject: Bug 905948: under mod_perl, HTTP/200 is returned when etags match
 If-None-Match

---
 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 627057777..455427fbf 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -142,9 +142,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