|
[-]
[+]
|
Changed |
varnish.spec
|
|
|
|
[-]
[+]
|
Deleted |
varnish-2.0.1-ESI.patch
^
|
| @@ -1,82 +0,0 @@
---- bin/varnishd/cache_hash.c.orig 2008-10-20 10:16:48.000000000 +0200
-+++ bin/varnishd/cache_hash.c 2008-10-20 10:17:45.000000000 +0200
-@@ -266,7 +266,8 @@
-
- if (busy_o != NULL) {
- /* There are one or more busy objects, wait for them */
-- VTAILQ_INSERT_TAIL(&oh->waitinglist, sp, list);
-+ if (sp->esis == 0)
-+ VTAILQ_INSERT_TAIL(&oh->waitinglist, sp, list);
- sp->objhead = oh;
- UNLOCK(&oh->mtx);
- return (NULL);
---- bin/varnishd/cache_vrt_esi.c.orig 2008-10-20 10:17:01.000000000 +0200
-+++ bin/varnishd/cache_vrt_esi.c 2008-10-20 10:20:03.000000000 +0200
-@@ -796,7 +796,6 @@
- void
- ESI_Deliver(struct sess *sp)
- {
--
- struct esi_bit *eb;
- struct object *obj;
-
-@@ -839,7 +838,16 @@
- sp->step = STP_RECV;
- http_ForceGet(sp->http);
- http_Unset(sp->http, H_Content_Length);
-- CNT_Session(sp);
-+ while (1) {
-+ CNT_Session(sp);
-+ if (sp->step == STP_DONE)
-+ break;
-+ AN(sp->wrk);
-+ WSL_Flush(sp->wrk, 0);
-+ DSL(0x20, SLT_Debug, sp->id, "loop waiting for ESI");
-+ usleep(10000);
-+ }
-+ assert(sp->step == STP_DONE);
- sp->esis--;
- sp->obj = obj;
-
---- bin/varnishtest/tests/r00345.vtc.orig 2008-10-20 10:24:38.000000000 +0200
-+++ bin/varnishtest/tests/r00345.vtc 2008-10-20 10:22:25.000000000 +0200
-@@ -0,0 +1,39 @@
-+# Id$
-+
-+test "#345, ESI waitinglist trouble"
-+
-+server s1 {
-+ rxreq
-+ txresp -body {<esi:include src="someurl">}
-+ rxreq
-+ sema r1 sync 2
-+ delay 1
-+ txresp -body {DATA}
-+} -start
-+
-+varnish v1 -arg "-p diag_bitmap=0x20" -vcl+backend {
-+ sub vcl_fetch {
-+ if (req.url == "/") {
-+ esi;
-+ }
-+ }
-+} -start
-+
-+client c1 {
-+ txreq
-+ rxresp
-+ expect resp.bodylen == 4
-+} -start
-+
-+client c2 {
-+ txreq
-+ sema r1 sync 2
-+ rxresp
-+ expect resp.bodylen == 4
-+} -run
-+
-+client c1 {
-+ txreq
-+ xresp
-+ expect resp.bodylen == 4
-+} -run
|
|
[-]
[+]
|
Added |
varnishncsa-vhost-2.1.patch
^
|
| @@ -0,0 +1,48 @@
+--- bin/varnishncsa/varnishncsa.c.orig 2009-03-27 13:13:32.000000000 +0100
++++ bin/varnishncsa/varnishncsa.c 2009-12-18 17:17:11.000000000 +0100
+@@ -102,6 +102,7 @@
+
+ static size_t nll;
+ static int prefer_x_forwarded_for = 0;
++static int print_virtualhost = 0;
+
+ static int
+ isprefix(const char *str, const char *prefix, const char *end,
+@@ -400,6 +401,9 @@
+ fo = priv;
+
+ /* %h */
++ if (lp->df_Host && print_virtualhost)
++ fprintf(fo, "%s ", lp->df_Host);
++
+ if (!lp->df_h && spec & VSL_S_BACKEND)
+ fprintf(fo, "127.0.0.1 ");
+ else if (lp->df_X_Forwarded_For && prefer_x_forwarded_for)
+@@ -512,7 +516,7 @@
+ {
+
+ fprintf(stderr,
+- "usage: varnishncsa %s [-aDV] [-n varnish_name] "
++ "usage: varnishncsa %s [-aDvV] [-n varnish_name] "
+ "[-P file] [-w file]\n", VSL_USAGE);
+ exit(1);
+ }
+@@ -531,7 +535,7 @@
+
+ vd = VSL_New();
+
+- while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:f")) != -1) {
++ while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:fv")) != -1) {
+ switch (c) {
+ case 'a':
+ a_flag = 1;
+@@ -548,6 +552,9 @@
+ case 'P':
+ P_arg = optarg;
+ break;
++ case 'v':
++ print_virtualhost = 1;
++ break;
+ case 'V':
+ varnish_version("varnishncsa");
+ exit(0);
|
|
|
Deleted |
varnish-2.0.2.tar.gz
^
|
|
|
Deleted |
varnish-2.0.3.tar.bz2
^
|
|
|
Deleted |
varnish-2.0.tar.gz
^
|
|
|
Changed |
varnish-2.1.tar.bz2
^
|
