[-]
[+]
|
Changed |
varnish.spec
|
|
[-]
[+]
|
Added |
varnishncsa-vhost-2.0.2.patch
^
|
@@ -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);
|
[-]
[+]
|
Changed |
varnishncsa-vhost.patch
^
|
@@ -1,13 +1,13 @@
---- 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 @@
+--- bin/varnishncsa/varnishncsa.c.orig 2009-02-12 12:15:24.000000000 +0100
++++ bin/varnishncsa/varnishncsa.c 2009-03-09 21:31:58.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, const char **next)
+ isprefix(const char *str, const char *prefix, const char *end,
@@ -400,6 +401,9 @@
fo = priv;
@@ -18,16 +18,16 @@
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)
+@@ -512,7 +516,7 @@
{
-- 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);
+ 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);
}
-
-@@ -529,7 +533,7 @@
+@@ -531,7 +535,7 @@
vd = VSL_New();
@@ -36,7 +36,7 @@
switch (c) {
case 'a':
a_flag = 1;
-@@ -546,6 +550,9 @@
+@@ -548,6 +552,9 @@
case 'P':
P_arg = optarg;
break;
|
[-]
[+]
|
Added |
varnishncsa-vhost.patch.debug
^
|
@@ -0,0 +1,57 @@
+--- 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;
+ 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)
+@@ -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)
+ {
+
+- 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);
|
[-]
[+]
|
Deleted |
varnishncsa-vhost.patch.saved
^
|
@@ -1,48 +0,0 @@
---- 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);
|
|
Added |
varnish-2.0.3.tar.bz2
^
|