--------------------- PatchSet 1892 Date: 2005/09/28 20:27:44 Author: dwsquid Branch: squid3-icap Tag: (none) Log: cosmetic: renaming HttpStateData's body_buf to request_body_buf to clarify its purpose. Members: src/http.cc:1.49.2.28->1.49.2.29 src/http.h:1.11.4.9->1.11.4.10 Index: squid3/src/http.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v retrieving revision 1.49.2.28 retrieving revision 1.49.2.29 diff -u -r1.49.2.28 -r1.49.2.29 --- squid3/src/http.cc 28 Sep 2005 19:53:20 -0000 1.49.2.28 +++ squid3/src/http.cc 28 Sep 2005 20:27:44 -0000 1.49.2.29 @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.49.2.28 2005/09/28 19:53:20 dwsquid Exp $ + * $Id: http.cc,v 1.49.2.29 2005/09/28 20:27:44 dwsquid Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -85,14 +85,14 @@ if (httpState == NULL) return; - if (httpState->body_buf) { + if (httpState->request_body_buf) { if (httpState->orig_request->body_connection.getRaw()) { clientAbortBody(httpState->orig_request); } - if (httpState->body_buf) { - memFree(httpState->body_buf, MEM_8K_BUF); - httpState->body_buf = NULL; + if (httpState->request_body_buf) { + memFree(httpState->request_body_buf, MEM_8K_BUF); + httpState->request_body_buf = NULL; } } @@ -1945,7 +1945,7 @@ httpRequestBodyHandler(char *buf, ssize_t size, void *data) { HttpStateData *httpState = (HttpStateData *) data; - httpState->body_buf = NULL; + httpState->request_body_buf = NULL; if (size > 0) { if (httpState->flags.headers_parsed && !httpState->flags.abuse_detected) { @@ -2004,8 +2004,8 @@ return; } - httpState->body_buf = (char *)memAllocate(MEM_8K_BUF); - clientReadBody(httpState->orig_request, httpState->body_buf, 8192, httpRequestBodyHandler, httpState); + httpState->request_body_buf = (char *)memAllocate(MEM_8K_BUF); + clientReadBody(httpState->orig_request, httpState->request_body_buf, 8192, httpRequestBodyHandler, httpState); } void Index: squid3/src/http.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/http.h,v retrieving revision 1.11.4.9 retrieving revision 1.11.4.10 diff -u -r1.11.4.9 -r1.11.4.10 --- squid3/src/http.h 31 Aug 2005 20:03:40 -0000 1.11.4.9 +++ squid3/src/http.h 28 Sep 2005 20:27:44 -0000 1.11.4.10 @@ -1,6 +1,6 @@ /* - * $Id: http.h,v 1.11.4.9 2005/08/31 20:03:40 dwsquid Exp $ + * $Id: http.h,v 1.11.4.10 2005/09/28 20:27:44 dwsquid Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -70,7 +70,7 @@ int fd; http_state_flags flags; FwdState *fwd; - char *body_buf; + char *request_body_buf; off_t currentOffset; size_t read_sz; int body_bytes_read; /* to find end of response, independent of StoreEntry */