From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 16 Oct 2012 03:41:57 +0000 (-0600)
Subject: Added explicit braces to avoid ambiguous "else" and make GCC happy.
X-Git-Tag: SQUID_3_4_0_1~563
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47fbd2a7c3ffe934c6a211996ef34c8cca19de27;p=thirdparty%2Fsquid.git

Added explicit braces to avoid ambiguous "else" and make GCC happy.

Pragma:no-cache has effect only when Cache-Control is absent.
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 7eb4185ae3..3eb84a8667 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1046,12 +1046,12 @@ clientInterpretRequestHeaders(ClientHttpRequest * http)
         request->flags.ims = 1;
 
     if (!request->flags.ignoreCc) {
-        if (request->cache_control)
+        if (request->cache_control) {
             if (request->cache_control->noCache())
                 no_cache=true;
 
         // RFC 2616: treat Pragma:no-cache as if it was Cache-Control:no-cache when Cache-Control is missing
-        else if (req_hdr->has(HDR_PRAGMA))
+        } else if (req_hdr->has(HDR_PRAGMA))
             no_cache = req_hdr->hasListMember(HDR_PRAGMA,"no-cache",',');
 
         /*