Changes - j0ke.net Open Build Service

Changes of Revision 20

[-] [+]	Changed	varnish.spec
@@ -2,7 +2,7 @@ %define pversion 2.0.2 Name: varnish Version: 2.0.2 -Release: 6 +Release: 7 # License: BSD Group: Productivity/Networking/Web/Proxy
[-] [+]	Changed	varnishncsa-vhost.patch ^
@@ -1,5 +1,5 @@ ---- bin/varnishncsa/varnishncsa.c.orig 2008-11-07 19:30:50.000000000 +0100 -+++ bin/varnishncsa/varnishncsa.c 2008-11-07 20:48:24.000000000 +0100 +--- bin/varnishncsa/varnishncsa.c.202 2008-11-27 15:18:23.000000000 +0100 ++++ bin/varnishncsa/varnishncsa.c 2008-11-27 15:18:48.000000000 +0100 @@ -103,6 +103,7 @@ static size_t nll; @@ -18,6 +18,15 @@ 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) +@@ -432,7 +436,7 @@ + /* %t / + strftime(tbuf, sizeof tbuf, "[%d/%b/%Y:%T %z]", &lp->df_t); + fprintf(fo, "%s ", tbuf); +- ++ fprintf(stderr,&lp->df_t); + / + * Fake "%r". This would be a lot easier if Varnish + * normalized the request URL. @@ -511,7 +515,7 @@ usage(void) {
[-] [+]	Added	varnishncsa-vhost.patch.saved ^
@@ -0,0 +1,48 @@ +--- bin/varnishncsa/varnishncsa.c.orig 2008-11-07 19:30:50.000000000 +0100 ++++ bin/varnishncsa/varnishncsa.c 2008-11-07 20:48:24.000000000 +0100 +@@ -103,6 +103,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, const char next) +@@ -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) +@@ -511,7 +515,7 @@ + usage(void) + { + +- fprintf(stderr, "usage: varnishncsa %s [-aDV] [-n varnish_name] [-P file] [-w file]\n", VSL_USAGE); ++ fprintf(stderr, "usage: varnishncsa %s [-aDvV] [-n varnish_name] [-P file] [-w file]\n", VSL_USAGE); + exit(1); + } + +@@ -529,7 +533,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; +@@ -546,6 +550,9 @@ + case 'P': + P_arg = optarg; + break; ++ case 'v': ++ print_virtualhost = 1; ++ break; + case 'V': + varnish_version("varnishncsa"); + exit(0);