r5030 - 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
Tue Jul 6 15:19:22 CEST 2010
Author: tfheen
Date: 2010-07-06 15:19:21 +0200 (Tue, 06 Jul 2010)
New Revision: 5030
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_esi.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/e00007.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_dir_random.c
Log:
Merge r4743, r4744, r4745: ESI panic when element spans malloc
segments
r4973: Use WSP instead of VSL for ordering and performance
r4974: Minor nitpicking
r4975: Fix a bug when ESI elements span storage elements, which only
the tightfisted -smalloc would trigger.
Fixes: #719
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
Modified: branches/2.1/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/cache_esi.c 2010-07-06 12:51:04 UTC (rev 5029)
+++ branches/2.1/varnish-cache/bin/varnishd/cache_esi.c 2010-07-06 13:19:21 UTC (rev 5030)
@@ -263,7 +263,7 @@
ew->eb->verbatim.e = TRUST_ME(verbatim + len);
sprintf(ew->eb->chunk_length, "%x\r\n", Tlen(ew->eb->verbatim));
if (params->esi_syntax & 0x4)
- VSL(SLT_Debug, ew->sp->fd, "AddBit: %d <%.*s>",
+ WSP(ew->sp, SLT_Debug, "AddBit: %d <%.*s>",
Tlen(ew->eb->verbatim),
Tlen(ew->eb->verbatim),
ew->eb->verbatim.b);
@@ -395,15 +395,14 @@
txt tag;
txt val;
unsigned u, v, s;
- struct ws *ws;
if (ew->eb == NULL || ew->eb->include.b != NULL)
esi_addbit(ew, NULL, 0);
eb = ew->eb;
- VSL(SLT_Debug, ew->sp->fd, "Incl \"%.*s\"", t.e - t.b, t.b);
+ WSP(ew->sp, SLT_Debug, "Incl \"%.*s\"", t.e - t.b, t.b);
while (esi_attrib(ew, &t, &tag, &val) == 1) {
if (params->esi_syntax & 0x4)
- VSL(SLT_Debug, ew->sp->fd, "<%.*s> -> <%.*s>",
+ WSP(ew->sp, SLT_Debug, "<%.*s> -> <%.*s>",
tag.e - tag.b, tag.b, val.e - val.b, val.b);
if (Tlen(tag) != 3 || memcmp(tag.b, "src", 3))
continue;
@@ -413,9 +412,7 @@
continue;
}
- /* Wee are saving the original string */
- ws = ew->sp->obj->ws_o;
- WS_Assert(ws);
+ /* We are saving the original string */
s = 0;
if (val.b != val.e) {
@@ -626,8 +623,8 @@
* XXX: Ideally, we should only pull together the bits
* XXX: we need, like the filename.
*/
- ew->tag.b = ew->sp->obj->ws_o->f;
- ew->tag.e = ew->tag.b + WS_Reserve(ew->sp->obj->ws_o, 0);
+ ew->tag.b = ew->sp->wrk->ws->f;
+ ew->tag.e = ew->tag.b + WS_Reserve(ew->sp->wrk->ws, 0);
px = ew->s;
q = ew->tag.b;
while (px.p != ew->p.p) {
@@ -636,7 +633,7 @@
Nep(&px);
}
ew->tag.e = q;
- WS_Release(ew->sp->obj->ws_o, Tlen(ew->tag));
+ WS_Release(ew->sp->wrk->ws, Tlen(ew->tag));
}
ll = Tlen(ew->tag);
ew->tag.b++;
@@ -651,7 +648,7 @@
ew->tag.b += 4 + (closing ? 1 : 0);
l = Tlen(ew->tag);
- VSL(SLT_Debug, ew->sp->fd,
+ WSP(ew->sp, SLT_Debug,
"tag {%.*s} %d %d %d", l, ew->tag.b, ew->remflg, empty, closing);
if (l >= 6 && !memcmp(ew->tag.b, "remove", 6)) {
if (empty) {
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/e00007.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/e00007.vtc 2010-07-06 12:51:04 UTC (rev 5029)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/e00007.vtc 2010-07-06 13:19:21 UTC (rev 5030)
@@ -31,7 +31,7 @@
}
} -start
-varnish v1 -vcl+backend {
+varnish v1 -storage "-smalloc,2m" -vcl+backend {
sub vcl_fetch {
esi;
}
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
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,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4977,4980-4981,4989
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4818,4829,4865-4867,4973-4975,4977,4980-4981,4989
More information about the varnish-commit
mailing list