]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorAutomatic source maintenance <squidadm@squid-cache.org>
Tue, 21 Dec 2010 10:32:24 +0000 (03:32 -0700)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Tue, 21 Dec 2010 10:32:24 +0000 (03:32 -0700)
src/HttpRequest.cc
src/client_side_reply.cc
src/store.cc

index 3071f15e0d2520a23af5dea1920c39da4efdf292..d21ae3fed5af4c5c2fbb07c008ca3b78e3b87257 100644 (file)
@@ -574,8 +574,8 @@ bool
 HttpRequest::conditional() const
 {
     return flags.ims ||
-        header.has(HDR_IF_MATCH) ||
-        header.has(HDR_IF_NONE_MATCH);
+           header.has(HDR_IF_MATCH) ||
+           header.has(HDR_IF_NONE_MATCH);
 }
 
 bool HttpRequest::inheritProperties(const HttpMsg *aMsg)
index e4bad4d0216697cdc6fc1dbcc43f3105034b07eb..a0af8e126ac33267e52c18f23d07b4ff04237739 100644 (file)
@@ -1858,7 +1858,7 @@ void
 clientReplyContext::sendNotModifiedOrPreconditionFailedError()
 {
     if (http->request->method == METHOD_GET ||
-        http->request->method == METHOD_HEAD)
+            http->request->method == METHOD_HEAD)
         sendNotModified();
     else
         sendPreconditionFailedError();
index 73a7705df91351dbcbae935d7c3f2d3b43cf71e2..d1be5ee5f2677c274f77336f48f85b8702c024a0 100644 (file)
@@ -1895,7 +1895,7 @@ StoreEntry::hasIfNoneMatchEtag(const HttpRequest &request) const
     const String reqETags = request.header.getList(HDR_IF_NONE_MATCH);
     // weak comparison is allowed only for HEAD or full-body GET requests
     const bool allowWeakMatch = !request.flags.range &&
-        (request.method == METHOD_GET || request.method == METHOD_HEAD);
+                                (request.method == METHOD_GET || request.method == METHOD_HEAD);
     return hasOneOfEtags(reqETags, allowWeakMatch);
 }
 
@@ -1920,7 +1920,7 @@ StoreEntry::hasOneOfEtags(const String &reqETags, const bool allowWeakMatch) con
             ETag reqETag;
             if (etagParseInit(&reqETag, str.termedBuf())) {
                 matched = allowWeakMatch ? etagIsWeakEqual(repETag, reqETag) :
-                    etagIsStrongEqual(repETag, reqETag);
+                          etagIsStrongEqual(repETag, reqETag);
             }
         }
     }