summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2016-07-05 23:37:17 +0200
committerStefan Fritsch <sf@sfritsch.de>2016-07-05 23:57:07 +0200
commitd9bc500cb4cac0378c5c3d2c4e41405f918f201f (patch)
tree14b3ed82d93cb4ab7cf3c414e5d2f1842b3ecd3f /debian/patches
parent0df95411a5fc890f06136a4c37361303221d06f1 (diff)
downloadapache2-d9bc500cb4cac0378c5c3d2c4e41405f918f201f.tar.gz
Tweaks for 2.4.23
- changelog - add new *.load files - drop obsolete ap_get_useragent_host_modperl_crash.patch - explicitly enable mod_proxy_http2 and mod_proxy_fdpass
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/ap_get_useragent_host_modperl_crash.patch15
-rw-r--r--debian/patches/series2
2 files changed, 1 insertions, 16 deletions
diff --git a/debian/patches/ap_get_useragent_host_modperl_crash.patch b/debian/patches/ap_get_useragent_host_modperl_crash.patch
deleted file mode 100644
index 2a3ec3d6..00000000
--- a/debian/patches/ap_get_useragent_host_modperl_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# http://svn.apache.org/viewvc?view=revision&revision=1742135
---- apache2.orig/server/core.c
-+++ apache2/server/core.c
-@@ -966,7 +966,10 @@ AP_DECLARE(const char *) ap_get_useragen
- int hostname_lookups;
- int ignored_str_is_ip;
-
-- if (r->useragent_addr == conn->client_addr) {
-+ /* Guard here when examining the host before the read_request hook
-+ * has populated an r->useragent_addr
-+ */
-+ if (!r->useragent_addr || (r->useragent_addr == conn->client_addr)) {
- return ap_get_remote_host(conn, r->per_dir_config, type, str_is_ip);
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index d73c0879..4a1b9140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,5 @@ reproducible_builds.diff
# This patch is applied manually
#suexec-custom.patch
-ap_get_useragent_host_modperl_crash.patch
+
fix_logresolve_segfault.patch