This repository has been archived by the owner on Sep 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Import Patch101 from Fedora to address CVE-2016-8740
- Loading branch information
1 parent
69f277f
commit 68f5f9b
Showing
2 changed files
with
38 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| --- a/modules/http2/h2_stream.c (revision 1771866) | ||
| +++ b/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); | ||
| + } | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,7 +48,7 @@ | |
| Summary: Apache HTTP Server | ||
| Name: %{real_name}%{ius_suffix} | ||
| Version: 2.4.23 | ||
| Release: 2.ius%{?dist} | ||
| Release: 4.ius%{?dist} | ||
| URL: http://httpd.apache.org/ | ||
| Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 | ||
| Source2: httpd.logrotate | ||
|
|
@@ -111,6 +111,7 @@ Patch56: httpd-2.4.4-mod_unique_id.patch | |
| Patch57: httpd-2.4.10-sigint.patch | ||
| # Security fixes | ||
| Patch100: httpd-2.4.18-CVE-2016-5387.patch | ||
| Patch101: httpd-2.4.23-CVE-2016-8740.patch | ||
|
|
||
| License: ASL 2.0 | ||
| Group: System Environment/Daemons | ||
|
|
@@ -335,6 +336,7 @@ interface for storing and accessing per-user session data. | |
| %patch57 -p1 -b .sigint | ||
|
|
||
| %patch100 -p1 -b .cve5387 | ||
| %patch101 -p1 -b .cve8740 | ||
|
|
||
| # Patch in the vendor string | ||
| sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h | ||
|
|
@@ -851,6 +853,9 @@ exit $rv | |
|
|
||
|
|
||
| %changelog | ||
| * Wed Dec 07 2016 Carl George <[email protected]> - 2.4.23-4.ius | ||
| - Import Patch101 from Fedora to address CVE-2016-8740 | ||
|
|
||
| * Fri Aug 26 2016 Ben Harper <[email protected]> - 2.4.23-3.ius | ||
| - update httpd.service to use /etc/sysconfig/httpd, see #11 | ||
|
|
||
|
|
||