From: Nick Kew Date: Sun, 7 May 2006 14:52:17 +0000 (+0000) Subject: Vote&promote (and fix typo while we're at it) X-Git-Tag: 2.2.3~90 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e50193c884beb49f60d0b4b152201a10d7c1b413;p=thirdparty%2Fapache%2Fhttpd.git Vote&promote (and fix typo while we're at it) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@404776 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 7d30c759f6f..2de4c151fd5 100644 --- a/CHANGES +++ b/CHANGES @@ -13,7 +13,7 @@ Changes with Apache 2.2.2 PR 38793. [Ruediger Pluem, matthias ] *) core: Prevent reading uninitialized memory while reading a line of - protocol input. PR 39282. [Davi Arnaut ] + protocol input. PR 39282. [Davi Arnaut ] *) mod_dbd: Update defaults, improve error reporting. [Chris Darroch , Nick Kew] diff --git a/STATUS b/STATUS index 1b0c388b552..0d77bac2314 100644 --- a/STATUS +++ b/STATUS @@ -76,6 +76,17 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + * Remove odd DECLINED code from mod_charset_lite filter. + http://svn.apache.org/viewcvs?rev=399665&view=rev + +1 trawick, rpluem, niq + niq: This is right, but the underlying behaviour (refuse to + work in a proxy) is bad. There's a TODO. + + * mod_charset_lite: Don't go through the motions of translating if + the source and dest charsets are the same. + http://svn.apache.org/viewcvs?rev=399668&view=rev + +1 trawick, rpluem, niq + PATCHES PROPOSED TO BACKPORT FROM TRUNK: * Backport mod_authz_dbd (it's had some testing now) @@ -89,15 +100,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/viewcvs.cgi?rev=396310&view=rev +1 niq - * Remove odd DECLINED code from mod_charset_lite filter. - http://svn.apache.org/viewcvs?rev=399665&view=rev - +1 trawick, rpluem - - * mod_charset_lite: Don't go through the motions of translating if - the source and dest charsets are the same. - http://svn.apache.org/viewcvs?rev=399668&view=rev - +1 trawick, rpluem - * mod_mem_cache: Add Content-Type to headers_out if not already set. PR 39266. Trunk version of patch: