diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-13950.patch')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-13950.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-13950.patch b/meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-13950.patch deleted file mode 100644 index 4eb6b85b1..000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-13950.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 8c162db8b65b2193e622b780e8c6516d4265f68b Mon Sep 17 00:00:00 2001 | ||
2 | From: Yann Ylavic <ylavic@apache.org> | ||
3 | Date: Mon, 11 May 2015 15:48:58 +0000 | ||
4 | Subject: [PATCH] mod_proxy_http: follow up to r1656259. The proxy connection | ||
5 | may be NULL during prefetch, don't try to dereference it! Still | ||
6 | origin->keepalive will be set according to p_conn->close by the caller | ||
7 | (proxy_http_handler). | ||
8 | |||
9 | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678771 13f79535-47bb-0310-9956-ffa450edef68 | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | CVE: CVE-2020-35504 | ||
13 | |||
14 | Reference to upstream patch: | ||
15 | https://bugzilla.redhat.com/show_bug.cgi?id=1966738 | ||
16 | https://github.com/apache/httpd/commit/8c162db8b65b2193e622b780e8c6516d4265f68b | ||
17 | |||
18 | Signed-off-by: Li Wang <li.wang@windriver.com> | ||
19 | --- | ||
20 | modules/proxy/mod_proxy_http.c | 2 -- | ||
21 | 1 file changed, 2 deletions(-) | ||
22 | |||
23 | diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c | ||
24 | index ec1e042..5f507d5 100644 | ||
25 | --- a/modules/proxy/mod_proxy_http.c | ||
26 | +++ b/modules/proxy/mod_proxy_http.c | ||
27 | @@ -570,7 +570,6 @@ static int ap_proxy_http_prefetch(proxy_http_req_t *req, | ||
28 | apr_off_t bytes; | ||
29 | int force10, rv; | ||
30 | apr_read_type_e block; | ||
31 | - conn_rec *origin = p_conn->connection; | ||
32 | |||
33 | if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")) { | ||
34 | if (req->expecting_100) { | ||
35 | @@ -630,7 +629,6 @@ static int ap_proxy_http_prefetch(proxy_http_req_t *req, | ||
36 | "chunked body with Content-Length (C-L ignored)", | ||
37 | c->client_ip, c->remote_host ? c->remote_host: ""); | ||
38 | req->old_cl_val = NULL; | ||
39 | - origin->keepalive = AP_CONN_CLOSE; | ||
40 | p_conn->close = 1; | ||
41 | } | ||
42 | |||
43 | -- | ||
44 | 2.7.4 | ||
45 | |||