summaryrefslogtreecommitdiffstats
path: root/debian/patches/CVE-2019-0220-2.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-25 04:41:28 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-25 04:41:28 +0000
commit2eeb62e38ae17a3523ad3cd81c3de9f20f9e7742 (patch)
treefe91033d4712f6d836006b998525656b9dd193b8 /debian/patches/CVE-2019-0220-2.patch
parentMerging upstream version 2.4.59. (diff)
downloadapache2-debian/2.4.59-1_deb10u1.tar.xz
apache2-debian/2.4.59-1_deb10u1.zip
Adding debian version 2.4.59-1~deb10u1.debian/2.4.59-1_deb10u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/CVE-2019-0220-2.patch')
-rw-r--r--debian/patches/CVE-2019-0220-2.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/debian/patches/CVE-2019-0220-2.patch b/debian/patches/CVE-2019-0220-2.patch
deleted file mode 100644
index 0204259..0000000
--- a/debian/patches/CVE-2019-0220-2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c4ef468b25718a26f2b92cbea3ca093729b79331 Mon Sep 17 00:00:00 2001
-From: Eric Covener <covener@apache.org>
-Date: Mon, 18 Mar 2019 12:10:15 +0000
-Subject: [PATCH] merge 1855743,1855744 ^/httpd/httpd/trunk .
-
-r->parsed_uri.path safety in recent backport
-
-*) core: fix SEGFAULT in CONNECT with recent change
- 2.4.x: svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
- +1: rpluem, icing, covener
-
-
-
-
-git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855751 13f79535-47bb-0310-9956-ffa450edef68
----
- server/request.c | 4 +++-
- server/util.c | 4 ++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/server/request.c b/server/request.c
-index 1ce8908824b..d5c558afa30 100644
---- a/server/request.c
-+++ b/server/request.c
-@@ -195,7 +195,9 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
- ap_getparents(r->uri); /* OK --- shrinking transformations... */
- if (sconf->merge_slashes != AP_CORE_CONFIG_OFF) {
- ap_no2slash(r->uri);
-- ap_no2slash(r->parsed_uri.path);
-+ if (r->parsed_uri.path) {
-+ ap_no2slash(r->parsed_uri.path);
-+ }
- }
-
- /* All file subrequests are a huge pain... they cannot bubble through the
-diff --git a/server/util.c b/server/util.c
-index 607c4850d86..f3b17f1581e 100644
---- a/server/util.c
-+++ b/server/util.c
-@@ -566,6 +566,10 @@ AP_DECLARE(void) ap_no2slash_ex(char *name, int is_fs_path)
-
- char *d, *s;
-
-+ if (!name || !*name) {
-+ return;
-+ }
-+
- s = d = name;
-
- #ifdef HAVE_UNC_PATHS