From: William A. Rowe Jr Date: Tue, 18 Apr 2006 21:55:09 +0000 (+0000) Subject: Promote and promote X-Git-Tag: 2.2.2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c5309cc2d3dbebd6dff78164376259700a4f45d;p=thirdparty%2Fapache%2Fhttpd.git Promote and promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395061 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 296e3904e96..38ca564cd47 100644 --- a/STATUS +++ b/STATUS @@ -71,9 +71,6 @@ CURRENT RELEASE NOTES: RELEASE SHOWSTOPPERS: -PATCHES ACCEPTED TO BACKPORT FROM TRUNK: - [ start all new proposals below, under PATCHES PROPOSED. ] - * http_protocol: Fix escaping of Expect error message Trunk version of patch: http://svn.apache.org/viewcvs?rev=394965&view=rev @@ -82,6 +79,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: +1: mjc, trawick, rpluem, jim +PATCHES ACCEPTED TO BACKPORT FROM TRUNK: + [ start all new proposals below, under PATCHES PROPOSED. ] + + * htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected + placement of crypt() prototype (unistd.h). + Trunk version of patch: + http://svn.apache.org/viewcvs?rev=393364&view=rev + 2.2.x version of patch: + Trunk version works + +1: trawick, colm, jim + + PATCHES PROPOSED TO BACKPORT FROM TRUNK: * mod_dbd: When threaded, create a private pool in child_init @@ -98,14 +107,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: -1 bnicholes - The authorization refactoring that was done is for 2.3 and above. This can not be backported to 2.2. - * htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected - placement of crypt() prototype (unistd.h). - Trunk version of patch: - http://svn.apache.org/viewcvs?rev=393364&view=rev - 2.2.x version of patch: - Trunk version works - +1: trawick, colm, jim - * core: Prevent read of unitialized memory in ap_rgetline_core. PR 39282. Trunk version of patch: http://svn.apache.org/viewcvs?rev=394070&view=rev