pool/apache2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 103789 from home:coolo:branches:openSUSE:Factory

Browse Source 
- compile with pcre 8.30 - patch taken from apache bugzilla

OBS-URL: https://build.opensuse.org/request/show/103789
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=356
This commit is contained in:
Factory Maintainer 2012-02-13 12:49:59 +00:00 committed by Git OBS Bridge
parent dc9fbb8810
commit 120b388e44
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 11 09:21:15 UTC 2012 - coolo@suse.com
- compile with pcre 8.30 - patch taken from apache bugzilla
-------------------------------------------------------------------
Sat Jan 21 13:54:01 CET 2012 - draht@suse.de

7
apache2.spec
View File

@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: apache2
BuildRequires: automake
BuildRequires: db-devel
@ -145,6 +143,8 @@ Patch102: httpd-keepalivetimeout-millisecs.patch
Patch104: httpd-mod_deflate_head.patch
Patch105: ssl-mode-release-buffers.patch
Patch106: httpd-2.2.x-CVE-2011-3368-server_protocl_c.diff
# PATCH-FIX-UPSTREAM https://issues.apache.org/bugzilla/show_bug.cgi?id=52623
Patch107: httpd-new_pcre.patch
Url: http://httpd.apache.org/
Icon: Apache.xpm
Summary: The Apache Web Server Version 2.2
@ -361,6 +361,9 @@ to administrators of web servers in general.
%patch104
%patch105
%patch106
%if 0%{?suse_version} >= 1220
%patch107
%endif
#
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE

23
httpd-new_pcre.patch Normal file
View File

@ -0,0 +1,23 @@
Index: server/util_pcre.c
===================================================================
--- server/util_pcre.c.orig 2012-02-11 10:07:31.000000000 +0100
+++ server/util_pcre.c 2012-02-11 10:08:23.062838133 +0100
@@ -128,6 +128,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *p
const char *errorptr;
int erroffset;
int options = 0;
+int nsub;
if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
@@ -137,7 +138,9 @@ preg->re_erroffset = erroffset;
if (preg->re_pcre == NULL) return AP_REG_INVARG;
-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
+ PCRE_INFO_CAPTURECOUNT, &nsub);
+preg->re_nsub = nsub;
return 0;
}