--------------------- PatchSet 10411 Date: 2008/01/15 13:50:05 Author: adri Branch: s27_adri Tag: (none) Log: The last commit was wrong; it didn't take into account the skipped bytes when returning hdr_sz. Unfortunately a lot of the logic is using hdr_sz as the "amount of data to skip." Argh. Members: src/client_side.c:1.202.2.9.4.38->1.202.2.9.4.39 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.202.2.9.4.38 retrieving revision 1.202.2.9.4.39 diff -u -r1.202.2.9.4.38 -r1.202.2.9.4.39 --- squid/src/client_side.c 15 Jan 2008 13:04:32 -0000 1.202.2.9.4.38 +++ squid/src/client_side.c 15 Jan 2008 13:50:05 -0000 1.202.2.9.4.39 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.202.2.9.4.38 2008/01/15 13:04:32 adri Exp $ + * $Id: client_side.c,v 1.202.2.9.4.39 2008/01/15 13:50:05 adri Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -4014,12 +4014,6 @@ *chttp = NULL; *cbytes = 0; - /* Skip whitespace */ - for (; len > 0 && xisspace(*buf); buf++, len--) - ; - if (len <= 0) - return 0; - HttpMsgBufInit(&msg, buf, len); /* XXX for now there's no deallocation function needed but this may change */ /* Limit the number of concurrent requests to 2 */ for (n = conn->reqs.head, nrequests = 0; n; n = n->next, nrequests++); @@ -4279,6 +4273,9 @@ chttp = NULL; cbytes = 0; + + /* XXX Trim whitespace here! */ + ret = clientTryParseRequest(conn, &cbytes, &chttp, clientConnBuf(&conn->in), clientConnBufLen(&conn->in)); if (cbytes > 0) {