Browse code
Added fix for CVE-2016-5387
Change-Id: I37648daf28628a5115e8d7a9912d7b67277786ea
Reviewed-on: http://photon-jenkins.eng.vmware.com/1220
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
dthaluru authored on 2016/07/28 06:07:05Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,13 @@ |
| 0 |
+--- a/server/util_script.c |
|
| 1 |
+@@ -195,6 +195,10 @@ |
|
| 2 |
+ } |
|
| 3 |
+ } |
|
| 4 |
+ #endif |
|
| 5 |
++ else if (!strcasecmp(hdrs[i].key, "Proxy")) {
|
|
| 6 |
++ /* Don't pass through HTTP_PROXY */ |
|
| 7 |
++ continue; |
|
| 8 |
++ } |
|
| 9 |
+ else |
|
| 10 |
+ add_unless_null(e, http2env(r, hdrs[i].key), hdrs[i].val); |
|
| 11 |
+ } |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache HTTP Server |
| 2 | 2 |
Name: httpd |
| 3 | 3 |
Version: 2.4.18 |
| 4 |
-Release: 4%{?dist}
|
|
| 4 |
+Release: 5%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: http://httpd.apache.org/ |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -10,6 +10,7 @@ Distribution: Photon |
| 10 | 10 |
Source0: http://archive.apache.org/dist/httpd/%{name}-%{version}.tar.bz2
|
| 11 | 11 |
%define sha1 httpd=271a129f2f04e3aa694e5c2091df9b707bf8ef80 |
| 12 | 12 |
Patch0: http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.4.18-blfs_layout-1.patch |
| 13 |
+Patch1: httpd-2.4.18-CVE-2016-5387.patch |
|
| 13 | 14 |
BuildRequires: openssl |
| 14 | 15 |
BuildRequires: openssl-devel |
| 15 | 16 |
BuildRequires: pcre-devel |
| ... | ... |
@@ -50,6 +51,7 @@ The httpd-tools of httpd. |
| 50 | 50 |
%prep |
| 51 | 51 |
%setup -q |
| 52 | 52 |
%patch0 -p1 |
| 53 |
+%patch1 -p1 |
|
| 53 | 54 |
%build |
| 54 | 55 |
./configure --prefix=%{_sysconfdir}/httpd \
|
| 55 | 56 |
--exec-prefix=%{_prefix} \
|
| ... | ... |
@@ -164,8 +166,10 @@ fi |
| 164 | 164 |
%{_bindir}/dbmmanage
|
| 165 | 165 |
|
| 166 | 166 |
%changelog |
| 167 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.18-4 |
|
| 168 |
-- GA - Bump release of all rpms |
|
| 167 |
+* Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 2.4.18-5 |
|
| 168 |
+- Added patch for CVE-2016-5387 |
|
| 169 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.18-4 |
|
| 170 |
+- GA - Bump release of all rpms |
|
| 169 | 171 |
* Thu May 05 2016 Kumar Kaushik <kaushikk@vmware.com> 2.4.18-3 |
| 170 | 172 |
- Adding upgrade support in pre/post/un script. |
| 171 | 173 |
* Mon Mar 21 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 2.4.18-2 |