Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 74425 invoked by uid 500); 22 Jan 2003 16:22:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 74400 invoked by uid 500); 22 Jan 2003 16:22:08 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 22 Jan 2003 16:22:07 -0000 Message-ID: <20030122162207.49031.qmail@icarus.apache.org> From: gregames@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server protocol.c X-Spam-Rating: 208.185.179.12.available.above.net 1.6.2 0/1000/N gregames 2003/01/22 08:22:07 Modified: . Tag: APACHE_2_0_BRANCH STATUS server Tag: APACHE_2_0_BRANCH protocol.c Log: ap_get_mime_headers: merge the null termination fix back to the 2.0 stable branch. remove the vote from STATUS (thanks, folks) and vote on a few other things. Revision Changes Path No revision No revision 1.751.2.54 +5 -9 httpd-2.0/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/httpd-2.0/STATUS,v retrieving revision 1.751.2.53 retrieving revision 1.751.2.54 diff -u -r1.751.2.53 -r1.751.2.54 --- STATUS 21 Jan 2003 22:20:20 -0000 1.751.2.53 +++ STATUS 22 Jan 2003 16:22:05 -0000 1.751.2.54 @@ -76,11 +76,6 @@ -1: brianp (we need a more robust solution than what's in 2.1 right now), jerenkrantz (should be fixed, but I don't have time to do this) - * Insure that ap_get_mime_headers passes a null terminated string - to ap_escape_html if ap_rgetline exits abnormally (e.g. header too long). - The patch is r1.123 thru r1.125 of server/protocol.c. - +1: gregames, trawick, jerenkrantz, nd - CURRENT RELEASE NOTES: * Backwards compatibility is expected of future Apache 2.0 releases, @@ -99,13 +94,13 @@ * APACHE_2_0_BRANCH *has* to work with an official stable version of APR (i.e., 1.0). yes: - no: trawick, jerenkrantz, wrowe, stoddard, striker, nd + no: trawick, jerenkrantz, wrowe, stoddard, striker, nd, gregames wrowe adds it's nice if we *can* compile against it, but as a matter of a practical tarball or binary release, don't. * APACHE_2_0_BRANCH uses a level of apr and apr-util code branched from the APACHE_2_0_44 tag. - yes: trawick, jerenkrantz, striker, nd + yes: trawick, jerenkrantz, striker, nd, gregames (but nd doesn't branch anything in apr repos) no: wrowe (objection remains the same, APR 0.9 is pretty much in 'bugfix' @@ -125,7 +120,8 @@ * Develop in Review-Then-Commit or Commit-Then-Review mode on APACHE_2_0_BRANCH (no vetoes, this is a straight vote.) - R-T-C: trawick, wrowe, jerenkrantz, stoddard, rederpj, striker, nd + R-T-C: trawick, wrowe, jerenkrantz, stoddard, rederpj, striker, nd, + gregames(lazy consensus OK for mainline) Abstain: C-T-R: BrianP, aaron, jim No revision No revision 1.121.2.1 +4 -5 httpd-2.0/server/protocol.c Index: protocol.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/protocol.c,v retrieving revision 1.121 retrieving revision 1.121.2.1 diff -u -r1.121 -r1.121.2.1 --- protocol.c 19 Nov 2002 19:32:38 -0000 1.121 +++ protocol.c 22 Jan 2003 16:22:06 -0000 1.121.2.1 @@ -766,18 +766,17 @@ int folded = 0; field = NULL; - rv = ap_rgetline(&field, DEFAULT_LIMIT_REQUEST_FIELDSIZE + 2, + rv = ap_rgetline(&field, r->server->limit_req_fieldsize + 2, &len, r, 0, bb); /* ap_rgetline returns APR_ENOSPC if it fills up the buffer before * finding the end-of-line. This is only going to happen if it * exceeds the configured limit for a field size. - * The cast is safe, limit_req_fieldsize cannot be negative */ - if (rv == APR_ENOSPC - || (rv == APR_SUCCESS - && len > (apr_size_t)r->server->limit_req_fieldsize)) { + if (rv == APR_ENOSPC && field) { r->status = HTTP_BAD_REQUEST; + /* insure ap_escape_html will terminate correctly */ + field[len - 1] = '\0'; apr_table_setn(r->notes, "error-notes", apr_pstrcat(r->pool, "Size of a request header field "