rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix build against PCRE 8.30

Browse Source
This commit is contained in:
Joe Orton 2012-02-13 12:02:00 +00:00
parent b8c1df7e3b
commit 15553f5032
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
httpd-2.2.22-pcre830.patch Normal file
View File

@ -0,0 +1,24 @@
http://svn.apache.org/viewvc?view=revision&revision=r1243176
--- httpd-2.2.22/server/util_pcre.c.pcre830
+++ httpd-2.2.22/server/util_pcre.c
@@ -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;
}

7
httpd.spec
View File

@ -9,7 +9,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.22
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@ -31,6 +31,7 @@ Patch2: httpd-2.1.10-apxs.patch
Patch3: httpd-2.2.9-deplibs.patch
Patch4: httpd-2.1.10-disablemods.patch
Patch5: httpd-2.1.10-layout.patch
Patch6: httpd-2.2.22-pcre830.patch
# Features/functional changes
Patch20: httpd-2.0.48-release.patch
Patch22: httpd-2.1.10-pod.patch
@ -119,6 +120,7 @@ Security (TLS) protocols.
%patch3 -p1 -b .deplibs
%patch4 -p1 -b .disablemods
%patch5 -p1 -b .layout
%patch6 -p1 -b .pcre830
%patch22 -p1 -b .pod
%patch23 -p1 -b .export
@ -539,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-2
- fix build against PCRE 8.30
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-1
- update to 2.2.22