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
This commit is contained in:
bzrmirror%bugzilla.org 2013-08-19 03:48:59 +00:00
parent 739e5965c8
commit 790c3d21c6
2 changed files with 5 additions and 4 deletions

View File

@ -1 +1 @@
8704 8705

View File

@ -135,9 +135,10 @@ sub handler : method {
Bugzilla::init_page(); Bugzilla::init_page();
my $result = $class->SUPER::handler(@_); my $result = $class->SUPER::handler(@_);
# When returning data from the REST api, tell Apache not to append its # When returning data from the REST api we must only return 200 or 304,
# error html documents to the response. # which tells Apache not to append its error html documents to the
return Bugzilla->usage_mode == USAGE_MODE_REST # response.
return Bugzilla->usage_mode == USAGE_MODE_REST && $result != 304
? Apache2::Const::OK ? Apache2::Const::OK
: $result; : $result;
} }