]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1773293, r1773761, r1773779, r1773812, r1773861, r1773862, r1773865 from trunk:
authorEric Covener <covener@apache.org>
Thu, 22 Dec 2016 14:54:33 +0000 (14:54 +0000)
committerEric Covener <covener@apache.org>
Thu, 22 Dec 2016 14:54:33 +0000 (14:54 +0000)
commitf8b61c1df288f660a63c4a4db0ede65624afec16
tree2d13708b84979b5cceeab7d3e971cafdeadbf5e2
parent20a29242f9204c16887db64e324615a52803f10b
Merge r1773293, r1773761, r1773779, r1773812, r1773861, r1773862, r1773865 from trunk:

change error handling for bad resp headers

 - avoid looping between ap_die and the http filter
 - remove the header that failed the check
 - keep calling apr_table_do until our fn stops matching

This is still not great. We get the original body, a 500 status
code and status line.

(r1773285 + fix for first return from check_headers)

Follow up to r1773293.
When check_headers() fails, clear anything (headers and body) from original/errorneous
response before returning 500.

Follow up to r1773761: don't check_headers() more than once.

Follow up to r1773761: don't recurse on internal redirects.

Follow up to r1773761: don't recurse on ap_send_error_response() either.

Follow up to r1773761: we need to check both ap_send_error_response() and internal redirect recursions.

Follow up to r1773761: improved recursion detection.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict@1775669 13f79535-47bb-0310-9956-ffa450edef68
modules/http/http_filters.c