diff options
author | Byron Jones <bjones@mozilla.com> | 2013-08-19 05:38:09 +0200 |
---|---|---|
committer | Byron Jones <bjones@mozilla.com> | 2013-08-19 05:38:09 +0200 |
commit | 74b8cef885e2ea1667b3e03f4aac4b3876fdfd59 (patch) | |
tree | a6c53107a0fa606d69841431617b72cdbac98cc9 | |
parent | 8d4c3e537a62b06649e60ea6cdc0abe033079c16 (diff) | |
download | bugzilla-74b8cef885e2ea1667b3e03f4aac4b3876fdfd59.tar.gz bugzilla-74b8cef885e2ea1667b3e03f4aac4b3876fdfd59.tar.xz |
Bug 905948: under mod_perl, HTTP/200 is returned when etags match If-None-Match
r=dkl, a=glob
-rw-r--r-- | mod_perl.pl | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |