From: William A. Rowe Jr Date: Wed, 4 Apr 2012 00:34:57 +0000 (+0000) Subject: Vote/Promote blocker X-Git-Tag: 2.2.23~197 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c35dc85e028c08198435077234662bc8e62d463a;p=thirdparty%2Fapache%2Fhttpd.git Vote/Promote blocker git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1309190 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 6d9d623b742..b5236ffd94b 100644 --- a/STATUS +++ b/STATUS @@ -114,6 +114,19 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: +1: rjung, rpluem, jorton -1: + * core: Fix building against external PCRE 8.30. + PCRE has removed long deprecated pcre_info(). Use pcre_fullinfo() + instead which is present as a replacement since PCRE 3.0 so + would also be OK when building with bundled PCRE. + PR 52623. + Trunk patch: + http://svn.apache.org/viewvc?rev=r1243176&view=rev + 2.4.x patch: + http://svn.apache.org/viewvc?rev=r1243177&view=rev + Backport version for 2.2.x of patch: + http://people.apache.org/~rjung/patches/pcre-httpd-2_2_x.patch + +1: rjung, jorton, wrowe + (Style nit; PCRE_... is indented one char too much) PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -164,19 +177,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: rpluem says: The proposed patch contains tabs and indenting is not correct. This should be fixed first. - * core: Fix building against external PCRE 8.30. - PCRE has removed long deprecated pcre_info(). Use pcre_fullinfo() - instead which is present as a replacement since PCRE 3.0 so - would also be OK when building with bundled PCRE. - PR 52623. - Trunk patch: - http://svn.apache.org/viewvc?rev=r1243176&view=rev - 2.4.x patch: - http://svn.apache.org/viewvc?rev=r1243177&view=rev - Backport version for 2.2.x of patch: - http://people.apache.org/~rjung/patches/pcre-httpd-2_2_x.patch - +1: rjung, jorton - * core: NUL-terminate string returned by ap_scan_script_header_err*() in error case. Trunk patch: