diff options
author | Leo Famulari <leo@famulari.name> | 2017-02-02 10:52:24 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-02-02 10:52:24 -0500 |
commit | e8c83d04e176f205b30b3d470f22ee5e1c686331 (patch) | |
tree | 30a95626ea31414a6319b93f50eea1e69b87a619 /gnu/packages/patches/httpd-CVE-2016-8740.patch | |
parent | d9b4cbc2a168ca3d248c5abf1f1d14c1808e6a20 (diff) | |
parent | de643f0c15677665acce73db9c28c5488e623633 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/httpd-CVE-2016-8740.patch')
-rw-r--r-- | gnu/packages/patches/httpd-CVE-2016-8740.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/httpd-CVE-2016-8740.patch b/gnu/packages/patches/httpd-CVE-2016-8740.patch deleted file mode 100644 index 17ba323ccf..0000000000 --- a/gnu/packages/patches/httpd-CVE-2016-8740.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch applies against httpd-2.4.23 and shouldn't be needed in later releases -http://openwall.com/lists/oss-security/2016/12/05/17 -Index: modules/http2/h2_stream.c -=================================================================== ---- modules/http2/h2_stream.c (revision 1771866) -+++ modules/http2/h2_stream.c (working copy) -@@ -322,18 +322,18 @@ - HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE); - } - } -- } -- -- if (h2_stream_is_scheduled(stream)) { -- return h2_request_add_trailer(stream->request, stream->pool, -- name, nlen, value, vlen); -- } -- else { -- if (!input_open(stream)) { -- return APR_ECONNRESET; -+ -+ if (h2_stream_is_scheduled(stream)) { -+ return h2_request_add_trailer(stream->request, stream->pool, -+ name, nlen, value, vlen); - } -- return h2_request_add_header(stream->request, stream->pool, -- name, nlen, value, vlen); -+ else { -+ if (!input_open(stream)) { -+ return APR_ECONNRESET; -+ } -+ return h2_request_add_header(stream->request, stream->pool, -+ name, nlen, value, vlen); -+ } - } - } - |