haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

apache: fix patchset.

Browse Source
This commit is contained in:
Jerome Duval
2016-11-01 17:11:02 +00:00
parent d83c7f1083
commit b27a00f73b
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
www-servers/apache/patches/apache-2.4.3.patchset
View File

@@ -1,13 +1,13 @@
From 0410108ac91734ad764c0c1a64e3e429ab86b0e6 Mon Sep 17 00:00:00 2001
From e8186cf22c52b4b5a662756e939df6ed35702eec Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Tue, 9 Dec 2014 19:29:31 +0000
Subject: Fixing patch
diff --git a/httpd-2.4.3/acinclude.m4 b/httpd-2.4.3/acinclude.m4
diff --git a/acinclude.m4 b/acinclude.m4
index 54defc2..b59b688 100644
--- a/httpd-2.4.3/acinclude.m4
+++ b/httpd-2.4.3/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,25 +4,25 @@ dnl Autoconf 2.50 can not handle substr correctly. It does have
dnl AC_HELP_STRING, so let's try to call it if we can.
dnl Note: this define must be on one line so that it can be properly returned
@@ -153,10 +153,10 @@ index 54defc2..b59b688 100644
APACHE_SUBST_EXPANDED_ARG(exec_prefix)
APACHE_SUBST_EXPANDED_ARG(bindir)
APACHE_SUBST_EXPANDED_ARG(sbindir)
diff --git a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c
diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index 0cf5693..f4e958c 100644
--- a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c
+++ b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -254,7 +254,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC,
connectport, 0, p);
@@ -166,10 +166,10 @@ index 0cf5693..f4e958c 100644
"failed to resolve hostname '%s'", connectname);
return ap_proxyerror(r, HTTP_BAD_GATEWAY,
apr_pstrcat(p, "DNS lookup failure for: ",
diff --git a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index a9b7ca2..178eea5 100644
--- a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c
+++ b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -33,7 +33,7 @@
#include <unistd.h> /* for getpid() */
#endif
@@ -180,19 +180,19 @@ index a9b7ca2..178eea5 100644
#if !defined(SHM_R)
#define SHM_R 0400
--
1.8.3.4
2.2.2
From 9ed8aff5487da044a341bde882f1aa3132d5398f Mon Sep 17 00:00:00 2001
From d6536335557d4d5397edf1575881fd980b91ed5a Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Mon, 15 Dec 2014 16:39:31 +0000
Subject: Fixed redefinition error
diff --git a/httpd-2.4.3/server/Makefile.in b/httpd-2.4.3/server/Makefile.in
diff --git a/server/Makefile.in b/server/Makefile.in
index 42d1fe5..9418843 100644
--- a/httpd-2.4.3/server/Makefile.in
+++ b/httpd-2.4.3/server/Makefile.in
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -32,7 +32,7 @@ test_char.h: gen_test_char
util.lo: test_char.h
@@ -203,5 +203,5 @@ index 42d1fe5..9418843 100644
# If export_files is a dependency here, but we remove it during this stage,
# when exports.c is generated, make will not detect that export_files is no
--
1.8.3.4
2.2.2