From: Automatic source maintenance Date: Sat, 7 May 2011 00:12:36 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: take07~16^2~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=985bfe6bdd8b593de2c4c6b4a88e07e92ecd7371;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/forward.cc b/src/forward.cc index 2ae2843c1b..39828bded3 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -834,7 +834,7 @@ FwdState::connectStart() fail(anErr); self = NULL; // refcounted return; - } + } request->flags.pinned = 0; if (fs->code == PINNED) { diff --git a/src/helper.cc b/src/helper.cc index 7f4b976be2..fe129889a6 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -886,19 +886,19 @@ helperHandleRead(int fd, char *buf, size_t len, comm_err_t flag, int xerrno, voi char *msg = srv->rbuf; int i = 0; debugs(84, 3, "helperHandleRead: end of reply found"); - + if (t > srv->rbuf && t[-1] == '\r' && hlp->eom == '\n') t[-1] = '\0'; - + *t++ = '\0'; - + if (hlp->childs.concurrency) { i = strtol(msg, &msg, 10); - + while (*msg && xisspace(*msg)) msg++; } - + helperReturnBuffer(i, srv, hlp, msg, t); } diff --git a/src/structs.h b/src/structs.h index 213b98d572..7896f349a2 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1012,7 +1012,7 @@ struct _iostats { struct request_flags { -request_flags(): range(0),nocache(0),ims(0),auth(0),cachable(0),hierarchical(0),loopdetect(0),proxy_keepalive(0),proxying(0),refresh(0),redirected(0),need_validation(0),fail_on_validation_err(0),stale_if_hit(0),accelerated(0),ignore_cc(0),intercepted(0),spoof_client_ip(0),internal(0),internalclient(0),must_keepalive(0),chunked_reply(0),stream_error(0),sslBumped(0),destinationIPLookedUp_(0) { + request_flags(): range(0),nocache(0),ims(0),auth(0),cachable(0),hierarchical(0),loopdetect(0),proxy_keepalive(0),proxying(0),refresh(0),redirected(0),need_validation(0),fail_on_validation_err(0),stale_if_hit(0),accelerated(0),ignore_cc(0),intercepted(0),spoof_client_ip(0),internal(0),internalclient(0),must_keepalive(0),chunked_reply(0),stream_error(0),sslBumped(0),destinationIPLookedUp_(0) { #if USE_HTTP_VIOLATIONS nocache_hack = 0; #endif