From ae4c67eb89e36478ac95b7c3bcd82c782f691aa9 Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Tue, 21 Dec 2010 03:32:24 -0700 Subject: [PATCH] SourceFormat Enforcement --- src/HttpRequest.cc | 4 ++-- src/client_side_reply.cc | 2 +- src/store.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 3071f15e0d..d21ae3fed5 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -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) diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index e4bad4d021..a0af8e126a 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -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(); diff --git a/src/store.cc b/src/store.cc index 73a7705df9..d1be5ee5f2 100644 --- a/src/store.cc +++ b/src/store.cc @@ -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); } } } -- 2.47.2