From: William A. Rowe Jr Date: Sat, 4 Feb 2006 19:05:53 +0000 (+0000) Subject: Clarify a vote; remove a backport completed. X-Git-Tag: 2.2.1~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101b0cbede07825f2878bcdf890eabc4993dab27;p=thirdparty%2Fapache%2Fhttpd.git Clarify a vote; remove a backport completed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@374908 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index bc28d4b9696..d6166d062cd 100644 --- a/STATUS +++ b/STATUS @@ -150,11 +150,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: * Fix mis-shifted 32 bit scope, masked to 64 bits as a method. URL: http://svn.apache.org/viewcvs?rev=358040&view=rev - +1: wrowe, mturk + +1: mturk -0: jorton: should use AP_METHOD_BIT wrowe asks; is this your desired patch? Please vote; - if (! (reqs[x].method_mask & (1 << m))) { + if (! (reqs[x].method_mask & (AP_METHOD_BIT << m))) { + +1: wrowe (for flavor requested by jorton) * mod_cache: Fix PR38017 (mod_cache not working in reverse proxy setup?) Trunk version of patch: @@ -180,11 +181,4 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: +1: rpluem, niq NOTE: this also supersedes previous fix to PR#37790 - * Solaris build proposal; don't fail on missing .h files within - a VPATH build, and don't test trees with -d (simply -f the - expected files) in case a tree such as srclib/apr is actually - a symlink rather than a true directory in ./buildconf. - http://svn.apache.org/viewcvs.cgi?rev=374821&view=rev - http://people.apache.org/~wrowe/fixbuild-2.2.patch - +1: wrowe, rpluem, colm