From 4cd2370bed609c118b6edfde5d3f116e5c35b897 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Dec 2017 16:17:22 +0000 Subject: gentoo resync : 03.12.2017 --- www-servers/apache/Manifest | 1 - www-servers/apache/files/apache-asf-httpoxy.patch | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 www-servers/apache/files/apache-asf-httpoxy.patch (limited to 'www-servers/apache') diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 29e09e4a611d..a7f625c08916 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,5 +1,4 @@ AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6 -AUX apache-asf-httpoxy.patch 830 BLAKE2B 9a7120eb536b44d998b216b6512db31c610cceaca3f11e4e39b0d73193267d6ba779f2c14b57bc0d453dab80139950d10ab3cde47e45779b6214077e4085f058 SHA512 efa44896c55cb9a0c87d5c2fff3684e9d0bb949b3e9ca8cf15b1bffa1cafe1d4f85cff8bd949129c0b4e7123940cfe7fba06121a948b6938eef054bec4c5fb94 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48 AUX apache2.2.service 716 BLAKE2B 0006b5f5eee85bf4bae7b1b49944cedb057df974b7ed6e74cee21eed109846d91537c997241554ee4ff7b8d0534dcc54fc435f6a1e9d1f07817091f93f986500 SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c diff --git a/www-servers/apache/files/apache-asf-httpoxy.patch b/www-servers/apache/files/apache-asf-httpoxy.patch deleted file mode 100644 index 68e3d869a77e..000000000000 --- a/www-servers/apache/files/apache-asf-httpoxy.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/589226 -https://www.apache.org/security/asf-httpoxy-response.txt - ---- server/util_script.c (revision 1752426) -+++ server/util_script.c (working copy) -@@ -186,6 +186,14 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r - else if (!strcasecmp(hdrs[i].key, "Content-length")) { - apr_table_addn(e, "CONTENT_LENGTH", hdrs[i].val); - } -+ /* HTTP_PROXY collides with a popular envvar used to configure -+ * proxies, don't let clients set/override it. But, if you must... -+ */ -+#ifndef SECURITY_HOLE_PASS_PROXY -+ else if (!strcasecmp(hdrs[i].key, "Proxy")) { -+ ; -+ } -+#endif - /* - * You really don't want to disable this check, since it leaves you - * wide open to CGIs stealing passwords and people viewing them -- cgit v1.2.3