Bug 905948: under mod_perl, HTTP/200 is returned when etags match If-None-Match

r=dkl, a=glob


git-svn-id: svn://10.0.0.236/trunk@264974 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webtools/bugzilla/.bzrrev

@@ -1 +1 @@
-8704
+8705

mozilla/webtools/bugzilla/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;
 }