From: wessels <>
Date: Tue, 22 Nov 2005 05:46:38 +0000 (+0000)
Subject: Changed #if WHEN_SQUID_IS_NOT_HTTP1_1 to #if WHEN_SQUID_IS_HTTP1_1
X-Git-Tag: SQUID_3_0_PRE4~520
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f3e583331ae0343f276d8580fd50e2610edd09f;p=thirdparty%2Fsquid.git

Changed #if WHEN_SQUID_IS_NOT_HTTP1_1 to #if WHEN_SQUID_IS_HTTP1_1
based on what the commented-out code attempts to do.
---

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 07b77984d4..aaad1fe8a1 100644
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpMsg.cc,v 1.19 2005/11/07 22:00:38 wessels Exp $
+ * $Id: HttpMsg.cc,v 1.20 2005/11/21 22:46:38 wessels Exp $
  *
  * DEBUG: section 74    HTTP Message
  * AUTHOR: Alex Rousskov
@@ -44,7 +44,6 @@ HttpMsg::HttpMsg(http_hdr_owner_type owner): header(owner),
         pstate(psReadyToParseStartLine)
 {}
 
-
 HttpMsgParseState &operator++ (HttpMsgParseState &aState)
 {
     int tmp = (int)aState;
@@ -52,7 +51,6 @@ HttpMsgParseState &operator++ (HttpMsgParseState &aState)
     return aState;
 }
 
-
 /* find end of headers */
 int
 httpMsgIsolateHeaders(const char **parse_start, const char **blk_start, const char **blk_end)
@@ -279,7 +277,6 @@ HttpMsg::httpMsgParseStep(const char *buf, int atEnd)
     return 1;
 }
 
-
 /* handy: resets and returns -1 */
 int
 HttpMsg::httpMsgParseError()
@@ -293,14 +290,12 @@ HttpMsg::httpMsgParseError()
     return -1;
 }
 
-
-
 /* returns true if connection should be "persistent"
  * after processing this message */
 int
 httpMsgIsPersistent(HttpVersion const &http_ver, const HttpHeader * hdr)
 {
-#if WHEN_SQUID_IS_NOT_HTTP1_1
+#if WHEN_SQUID_IS_HTTP1_1
 
     if ((http_ver.major >= 1) && (http_ver.minor >= 1)) {
         /*