From: William A. Rowe Jr Date: Mon, 1 Mar 2010 17:09:28 +0000 (+0000) Subject: Rev the patch to address rpluem's observations. Preserved old patch X-Git-Tag: 2.2.15~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebb4fc40baa861e36e0f6c23ca27b719f1816e99;p=thirdparty%2Fapache%2Fhttpd.git Rev the patch to address rpluem's observations. Preserved old patch for referrence in p.a.o/~wrowe/ space. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917593 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index cf038f67e06..dbb4e8dcbfa 100644 --- a/STATUS +++ b/STATUS @@ -92,24 +92,12 @@ RELEASE SHOWSTOPPERS: Applied to trunk; http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?r1=901578&r2=901577 Ported to 2.2 (also attached to PR); - http://people.apache.org/~wrowe/protocol_headers_copy.patch + http://people.apache.org/~wrowe/httpd-headers-in-fix.patch +1: wrowe, minfrin - rpluem says: The patch fails to compile: - -protocol.c: In function `ap_set_sub_req_protocol': -protocol.c:1091: error: too many arguments to function `strip_headers_request_body' -make[2]: *** [protocol.lo] Error 1 -make[1]: *** [all-recursive] Error 1 -make: *** [all-recursive] Error 1 - - Once this is fixed I am +1. - minfrin: trunk patch works for me, and includes a change to - modules/http/http_request.c. I suspect protocol_headers_copy.patch - is an older path, can you confirm? - rpluem: I was voting on http://people.apache.org/~wrowe/protocol_headers_copy.patch - but you have a good point with the change to - modules/http/http_request.c. So I change my vote to -1 until it - is clear on what we are voting and how this patch looks like. + -1: rpluem says: The patch fails to compile + wrowe; the r arg to strip_headers_request_body was no longer needed, sorry I had + not checked protocol_headers_copy.patch at -Wall. win32 let it slide. + see revised patch above PATCHES ACCEPTED TO BACKPORT FROM TRUNK: