summaryrefslogtreecommitdiffstats
path: root/mod_perl.pl
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-08-19 05:36:30 +0200
committerByron Jones <bjones@mozilla.com>2013-08-19 05:36:30 +0200
commit1ed8e326cdb55256fc829102e46b3029b0f39202 (patch)
tree3575b2ef2b435d7e90338b1f5e1900513a4c9de3 /mod_perl.pl
parentf57e316cc05dac0e232bfa51c3598fd9e337d50d (diff)
downloadbugzilla-1ed8e326cdb55256fc829102e46b3029b0f39202.tar.gz
bugzilla-1ed8e326cdb55256fc829102e46b3029b0f39202.tar.xz
Bug 905948: under mod_perl, HTTP/200 is returned when etags match If-None-Match
Diffstat (limited to 'mod_perl.pl')
-rw-r--r--mod_perl.pl7
1 files changed, 4 insertions, 3 deletions
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;
}