r4708 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Wed Apr 21 12:36:12 CEST 2010
Author: tfheen
Date: 2010-04-21 12:36:12 +0200 (Wed, 21 Apr 2010)
New Revision: 4708
Modified:
branches/2.1/
branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
branches/2.1/varnish-cache/bin/varnishd/cache_center.c
branches/2.1/varnish-cache/bin/varnishd/cache_response.c
branches/2.1/varnish-cache/bin/varnishd/mgt_child.c
branches/2.1/varnish-cache/bin/varnishd/stevedore.c
branches/2.1/varnish-cache/bin/varnishd/vparam.h
branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
branches/2.1/varnish-cache/include/vct.h
branches/2.1/varnish-cache/include/vev.h
branches/2.1/varnish-cache/lib/libvarnish/tcp.c
branches/2.1/varnish-cache/lib/libvarnish/vev.c
branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
branches/2.1/varnish-cache/lib/libvcl/vcc_var.c
Log:
Merge r4689: Whitespace cleanup
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686,4689
Modified: branches/2.1/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/cache_center.c 2010-04-21 10:26:07 UTC (rev 4707)
+++ branches/2.1/varnish-cache/bin/varnishd/cache_center.c 2010-04-21 10:36:12 UTC (rev 4708)
@@ -1051,7 +1051,7 @@
assert(sp->handling == VCL_RET_HASH);
SHA256_Final(sp->digest, sp->wrk->sha256ctx);
- if (!strcmp(sp->http->hd[HTTP_HDR_REQ].b, "HEAD"))
+ if (!strcmp(sp->http->hd[HTTP_HDR_REQ].b, "HEAD"))
sp->wantbody = 0;
else
sp->wantbody = 1;
Modified: branches/2.1/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/cache_response.c 2010-04-21 10:26:07 UTC (rev 4707)
+++ branches/2.1/varnish-cache/bin/varnishd/cache_response.c 2010-04-21 10:36:12 UTC (rev 4708)
@@ -207,8 +207,8 @@
} else if (params->http_range_support)
http_SetHeader(sp->wrk, sp->fd, sp->wrk->resp,
"Accept-Ranges: bytes");
-
+
TIM_format(TIM_real(), time_str);
http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Date: %s", time_str);
@@ -248,7 +248,7 @@
if (sp->esis == 0)
/* no headers for interior ESI includes */
- sp->acct_req.hdrbytes +=
+ sp->acct_req.hdrbytes +=
http_Write(sp->wrk, sp->wrk->resp, 1);
if (WRW_FlushRelease(sp->wrk)) {
@@ -279,7 +279,7 @@
sp->http->protover >= 1.1 &&
sp->obj->len > 0) {
/*
- * Interior ESI includes (which are not themselves ESI
+ * Interior ESI includes (which are not themselves ESI
* objects) use chunked encoding (here) or EOF (nothing)
*/
assert(sp->wantbody);
@@ -304,7 +304,7 @@
off = 0;
if (ptr + len <= low) {
/* This segment is too early */
- ptr += len;
+ ptr += len;
continue;
}
if (ptr < low) {
Modified: branches/2.1/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/mgt_child.c 2010-04-21 10:26:07 UTC (rev 4707)
+++ branches/2.1/varnish-cache/bin/varnishd/mgt_child.c 2010-04-21 10:36:12 UTC (rev 4708)
@@ -101,7 +101,7 @@
/*--------------------------------------------------------------------
* Track the highest file descriptor the parent knows is being used.
*
- * This allows the child process to clean/close only a small fraction
+ * This allows the child process to clean/close only a small fraction
* of the possible file descriptors after exec(2).
*
* This is likely to a bit on the low side, as libc and other libraries
Modified: branches/2.1/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/stevedore.c 2010-04-21 10:26:07 UTC (rev 4707)
+++ branches/2.1/varnish-cache/bin/varnishd/stevedore.c 2010-04-21 10:36:12 UTC (rev 4708)
@@ -141,8 +141,8 @@
o = (void *)st->ptr; /* XXX: align ? */
l = PRNDDN(st->space - (sizeof *o + lh));
-
+
STV_InitObj(sp, o, l, lh, nhttp);
o->objstore = st;
return (o);
Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686,4689
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686,4689
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c 2010-04-21 10:26:07 UTC (rev 4707)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c 2010-04-21 10:36:12 UTC (rev 4708)
@@ -308,7 +308,7 @@
ae->mask = vcc_UintVal(tl);
}
- if (ae->para)
+ if (ae->para)
SkipToken(tl, ')');
if (!vcc_acl_try_netnotation(tl, ae)) {
Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686,4689
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_var.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_var.c 2010-04-21 10:26:07 UTC (rev 4707)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_var.c 2010-04-21 10:36:12 UTC (rev 4708)
@@ -131,7 +131,7 @@
Fb(tl, 0, "%g", d);
} else if (vp->fmt == FLOAT) {
Fb(tl, 0, "%g", vcc_DoubleVal(tl));
- } else if (vp->fmt == INT) {
+ } else if (vp->fmt == INT) {
Fb(tl, 0, "%u", vcc_UintVal(tl));
} else {
AN(vt);
More information about the varnish-commit
mailing list