From: robertc <>
Date: Sat, 26 Oct 2002 08:18:12 +0000 (+0000)
Subject: simplify conditional
X-Git-Tag: SQUID_3_0_PRE1~561
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d53363a83ad97e797c32ba2d3625d54d03aeb44;p=thirdparty%2Fsquid.git

simplify conditional
---

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 94714304c8..5ef4b48d95 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.20 2002/10/25 07:36:32 robertc Exp $
+ * $Id: client_side_reply.cc,v 1.21 2002/10/26 02:18:12 robertc Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -1022,16 +1022,12 @@ clientCheckTransferDone(clientReplyContext * context)
     /* mem->reply was wrong because it uses the UPSTREAM header length!!! */
     reply = mem->reply;
     if (context->headers_sz == 0)
-	return 0;		/* haven't found end of headers yet */
-    else if (reply->sline.status == HTTP_OK)
-	sending = SENDING_BODY;
-    else if (reply->sline.status == HTTP_NO_CONTENT)
-	sending = SENDING_HDRSONLY;
-    else if (reply->sline.status == HTTP_NOT_MODIFIED)
-	sending = SENDING_HDRSONLY;
-    else if (reply->sline.status < HTTP_OK)
-	sending = SENDING_HDRSONLY;
-    else if (http->request->method == METHOD_HEAD)
+	/* haven't found end of headers yet */
+	return 0;
+    else if (reply->sline.status == HTTP_NO_CONTENT ||
+	     reply->sline.status == HTTP_NOT_MODIFIED ||
+	     reply->sline.status < HTTP_OK ||
+	     http->request->method == METHOD_HEAD)
 	sending = SENDING_HDRSONLY;
     else
 	sending = SENDING_BODY;