int HttpStateData.do_next_read is really boolean. It can become

http_state_flags.do_next_read.

diff --git a/src/http.cc b/src/http.cc
index c809719e7c37a3c6253d909283711dfd080a6388..8b86b53d82476829275b69686171d20474c1804e 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.453 2005/08/19 16:49:26 wessels Exp $
+ * $Id: http.cc,v 1.454 2005/08/19 17:03:28 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -932,7 +932,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
 {
     int bin;
     int clen;
-    do_next_read = 0;
+    flags.do_next_read = 0;
 
 
     assert(buf == readBuf);
@@ -990,7 +990,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
         if (len == 0) {
             /* Continue to read... */
             /* Timeout NOT increased. This whitespace was from previous reply */
-            do_next_read = 1;
+            flags.do_next_read = 1;
             maybeReadData();
             return;
         }
@@ -1003,17 +1003,17 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
                       fd, xstrerror());
 
         if (ignoreErrno(errno)) {
-            do_next_read = 1;
+            flags.do_next_read = 1;
         } else if (entry->isEmpty()) {
             ErrorState *err;
             err = errorCon(ERR_READ_ERROR, HTTP_BAD_GATEWAY);
             err->request = requestLink((HttpRequest *) request);
             err->xerrno = errno;
             fwdFail(fwd, err);
-            do_next_read = 0;
+            flags.do_next_read = 0;
             comm_close(fd);
         } else {
-            do_next_read = 0;
+            flags.do_next_read = 0;
             comm_close(fd);
         }
     } else if (flag == COMM_OK && len == 0 && entry->isEmpty()) {
@@ -1023,7 +1023,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
         err->request = requestLink((HttpRequest *) request);
         fwdFail(fwd, err);
         eof = 1;
-        do_next_read = 0;
+        flags.do_next_read = 0;
         comm_close(fd);
     } else if (flag == COMM_OK && len == 0) {
         /* Connection closed; retrieval done. */
@@ -1042,7 +1042,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
             err = errorCon(ERR_INVALID_RESP, HTTP_BAD_GATEWAY);
             err->request = requestLink((HttpRequest *) request);
             fwdFail(fwd, err);
-            do_next_read = 0;
+            flags.do_next_read = 0;
         } else {
             if (entry->mem_obj->getReply()->sline.status == HTTP_HEADER_TOO_LARGE) {
                 ErrorState *err;
@@ -1055,7 +1055,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
                 fwdComplete(fwd);
             }
 
-            do_next_read = 0;
+            flags.do_next_read = 0;
             comm_close(fd);
         }
     } else {
@@ -1101,7 +1101,7 @@ void
 HttpStateData::processReplyData(const char *buf, size_t len)
 {
     if (!flags.headers_parsed) {
-        do_next_read = 1;
+        flags.do_next_read = 1;
         maybeReadData();
         return;
     }
@@ -1152,13 +1152,13 @@ HttpStateData::processReplyData(const char *buf, size_t len)
                 commSetTimeout(fd, Config.Timeout.read, NULL, NULL);
             }
 
-            do_next_read = 1;
+            flags.do_next_read = 1;
             break;
 
         case COMPLETE_PERSISTENT_MSG:
             /* yes we have to clear all these! */
             commSetTimeout(fd, -1, NULL, NULL);
-            do_next_read = 0;
+            flags.do_next_read = 0;
 
             comm_remove_close_handler(fd, httpStateFree, this);
             fwdUnregister(fd, fwd);
@@ -1198,8 +1198,8 @@ HttpStateData::processReplyData(const char *buf, size_t len)
 void
 HttpStateData::maybeReadData()
 {
-    if (do_next_read) {
-        do_next_read = 0;
+    if (flags.do_next_read) {
+        flags.do_next_read = 0;
         entry->delayAwareRead(fd, buf, SQUID_TCP_SO_RCVBUF, httpReadReply, this);
     }
 }

diff --git a/src/http.h b/src/http.h
index dfedb43d4c9dce62210ee0dbaf20b218086fab8d..50bc2121d7cbd1f91598d860d68c1cfc893b9898 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.h,v 1.12 2005/08/19 16:49:27 wessels Exp $
+ * $Id: http.h,v 1.13 2005/08/19 17:03:28 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -60,7 +60,6 @@ public:
     FwdState *fwd;
     char *body_buf;
     off_t currentOffset;
-    int do_next_read;
     size_t read_sz;
     char buf[SQUID_TCP_SO_RCVBUF];
     bool ignoreCacheControl;

diff --git a/src/structs.h b/src/structs.h
index e9fb1246ab53e85e7c5da2d5c93538bc5aedfe3c..e5f2904573e5df02778eefda4d043bcf43ed8074 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.522 2005/08/19 16:49:27 wessels Exp $
+ * $Id: structs.h,v 1.523 2005/08/19 17:03:28 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -989,6 +989,9 @@ unsigned int abuse_detected:
 
 unsigned int request_sent:
     1;
+
+unsigned int do_next_read:
+    1;
 };
 
 struct _ipcache_addrs