Changes of Revision 2
| [-] | Added | varnish.changes |
|
1 2 +-------------------------------------------------------------------3 +Sun Oct 9 09:45:57 UTC 2011 - cs@linux-administrator.com4 +5 +- initial build of uplex varnish 6 +7 |
||
| [-] | Changed | varnish.spec ^ |
|
120 1 2 # norootforbuild3 -%define pversion 2.0.64 +%define pversion 2.0.3_VSLP5 Name: varnish6 -Version: 2.0.67 +Version: 2.0.38 Release: 139 #10 License: BSD11 12 BuildRoot: %{_tmppath}/%{name}-%{version}-build13 BuildRequires: ncurses-devel libxslt14 Requires: gcc15 +Provides: varnish-vslp16 %define _bindir %{_sbindir}17 %define pkg_home %{_var}/lib/%{name}18 %define pkg_logdir %{_var}/log/%{name}19 20 Source2: varnish.init21 Patch0: varnish-redhat-pid.patch22 Patch1: varnishncsa-vhost.patch23 -# bugfixes24 -# changeset 3308 / included since 2.0.125 -#Patch100: %{name}-%{version}-acl_compile.patch26 -# changeset 3315 / included since 2.0.127 -#Patch101: %{name}-%{version}-coredump_http_protocol_input.patch28 -# changeset 3322 / included since 2.0.229 -#Patch102: %{name}-%{version}-ESI.patch30 31 Summary: Varnish is a high-performance HTTP accelerator32 33 34 35 %package -n libvarnish136 Group: Productivity/Networking/Web/Proxy37 +Conflicts: libvarnish038 #39 Summary: Shared libraries for Varnish40 %description -n libvarnish141 42 43 %debug_package44 %prep45 -%setup -n %{name}-%{pversion} 46 +%setup -n universal_%{name}-%{pversion} 47 %patch048 %patch149 -##%patch10050 -##%patch10151 -##%patch10252 53 touch AUTHORS COPYING NEWS54 55 56 %{_libdir}/libvarnishcompat.so57 58 %changelog59 -* Fri Dec 18 2009 Carsten Schoene <cs@linux-administrator.com> - 2.0.6-1360 -- update to release 2.0.661 -62 -* Tue Jun 16 2009 Carsten Schoene <cs@linux-administrator.com> - 2.0.4-1263 -- remove last patch64 -65 -* Thu Jun 04 2009 Carsten Schoene <cs@linux-administrator.com> - 2.0.4-1166 -- added notimeouts_norecycle.patch fixes (#495)67 -68 -* Thu Apr 02 2009 Carsten Schoene <cs@linux-administrator.com> - 2.0.4-1069 -- update to release 2.0.470 - - Serve graced objects if the backend is unhealthy71 - - Portability fixes for Solaris, MacOS X/Darwin and NetBSD72 - - Documentation updates73 - - Added server.hostname and server.identity to VCL74 - - Fixed a problem where we would sleep for far too long when we would run out of file descriptors75 - - Add support for processing binary objects with ESI76 -77 -* Sat Mar 28 2009 Carsten Schoene <cs@linux-administrator.com> - 2.0.3-978 -- only changes in specfile79 -80 -* Mon Mar 09 2009 Carsten Schoene <cs@linux-administrator.com>81 -- update to release 2.0.382 - - Support for backend timeouts83 - - Multiple fixes in how we process ESI84 - - restart in vcl_hit is now supported85 - - Documentation has been updated86 - - Expiry processing is now more scalable87 - - The default session workspace is now 16k instead of 8k88 - - More graceful handling of too many headers from the client or the server.89 - - More expressive purges 90 -91 -* Fri Nov 14 2008 Carsten Schoene <cs@linux-administrator.com>92 -- update to release 2.0.293 - - This release fixes a possible ESI crash94 - - increases the stack size for varnishreplay and makes it work on Linux95 - - fixes the random director to actually work properly96 - - makes it possible to remove duplicate purges97 - - adds a man page for varnishtest98 - - and makes resp.status work correctly in VCL99 -100 -* Mon Oct 20 2008 Carsten Schoene <cs@linux-administrator.com>101 -- add ESI Patch / r3322102 -103 -* Fri Oct 17 2008 Carsten Schoene <cs@linux-administrator.com>104 -- update to release 2.0.1105 -106 -* Fri Oct 17 2008 Carsten Schoene <cs@linux-administrator.com>107 -- added two patches for 2.0 fixes:108 - - acl_compile.patch109 - - coredump_http_protocol_input.patch110 -111 -* Wed Oct 15 2008 Carsten Schoene <cs@linux-administrator.com>112 -- build final version 2.0113 -114 -* Tue Oct 14 2008 Carsten Schoene <cs@linux-administrator.com>115 -- build varnish 2.0-rc1 as prepareration for final 2.0116 -117 -* Tue Apr 08 2008 Carsten Schoene <cs@linux-administrator.com>118 -- initial build of version 1.1.2119 -120 |
||
| [+] | Deleted | varnish-2.0-acl_compile.patch ^ |
| @@ -1,11 +0,0 @@ ---- lib/libvcl/vcc_acl.c.orig 2008-10-17 16:30:13.000000000 +0200 -+++ lib/libvcl/vcc_acl.c 2008-10-17 16:30:31.000000000 +0200 -@@ -397,7 +397,7 @@ - Fh(tl, 0, "\t%*s%sif ((a[%d] & 0x%x) == %d) {\n", - -i, "", - oc, -- i, (0xff00 >> m) & 0xff, -+ i - 1, (0xff00 >> m) & 0xff, - ae->data[i] & ((0xff00 >> m) & 0xff)); - at[i] = 256; - depth = i; | ||
| [+] | Deleted | varnish-2.0-coredump_http_protocol_input.patch ^ |
| @@ -1,53 +0,0 @@ ---- bin/varnishd/cache_center.c.orig 2008-10-17 16:33:36.000000000 +0200 -+++ bin/varnishd/cache_center.c 2008-10-17 16:34:19.000000000 +0200 -@@ -308,6 +308,7 @@ - - /* We always close when we take this path */ - sp->doclose = "error"; -+ sp->wantbody = 1; - - w = sp->wrk; - if (sp->obj == NULL) { ---- bin/varnishd/cache_http.c.orig 2008-10-17 16:33:45.000000000 +0200 -+++ bin/varnishd/cache_http.c 2008-10-17 16:36:01.000000000 +0200 -@@ -496,16 +496,17 @@ - - i = http_splitline(sp->wrk, sp->fd, hp, htc, - HTTP_HDR_REQ, HTTP_HDR_URL, HTTP_HDR_PROTO); -- hp->protover = 0.9; -+ if (i != 0) { -+ WSPR(sp, SLT_HttpGarbage, htc->rxbuf); -+ return (i); -+ } -+ - if (!strcmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.0")) - hp->protover = 1.0; - else if (!strcmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.1")) - hp->protover = 1.1; - else - hp->protover = 0.9; -- -- if (i != 0) -- WSPR(sp, SLT_HttpGarbage, htc->rxbuf); - return (i); - } - ---- bin/varnishtest/tests/r00354.vtc.orig 2008-10-17 16:38:25.000000000 +0200 -+++ bin/varnishtest/tests/r00354.vtc 2008-10-17 16:38:19.000000000 +0200 -@@ -0,0 +1,16 @@ -+# $Id$ -+ -+test "#354 Segfault in strcmp in http_DissectRequest()" -+ -+server s1 { -+ rxreq -+ txresp -+} -+ -+varnish v1 -vcl+backend {} -start -+ -+client c1 { -+ send "FOO\r\n\r\n" -+ rxresp -+ expect resp status == 400 -+} -run | ||
| [+] | 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 | ||
| [+] | Deleted | varnish-2.0.4-notimeouts_norecycle.patch ^ |
| @@ -1,38 +0,0 @@ ---- varnish-2.0.4/bin/varnishd/cache_backend.c.orig 2009-06-04 19:46:54.000000000 +0200 -+++ varnish-2.0.4/bin/varnishd/cache_backend.c 2009-06-04 19:48:48.000000000 +0200 -@@ -99,9 +99,9 @@ - if (bp->connect_timeout > 10e-3) - tmo = (int)(bp->connect_timeout * 1000); - -- if (tmo > 0) -- i = TCP_connect(s, sa, salen, tmo); -- else -+// if (tmo > 0) -+// i = TCP_connect(s, sa, salen, tmo); -+// else - i = connect(s, sa, salen); - - if (i != 0) { -@@ -311,14 +311,14 @@ - Lck_Unlock(&bp->mtx); - if (vc == NULL) - break; -- if (VBE_CheckFd(vc->fd)) { -- /* XXX locking of stats */ -- VSL_stats->backend_reuse += 1; -- VSL_stats->backend_conn++; -- WSP(sp, SLT_Backend, "%d %s %s", -- vc->fd, sp->director->vcl_name, bp->vcl_name); -- return (vc); -- } -+// if (VBE_CheckFd(vc->fd)) { -+// /* XXX locking of stats */ -+// VSL_stats->backend_reuse += 1; -+// VSL_stats->backend_conn++; -+// WSP(sp, SLT_Backend, "%d %s %s", -+// vc->fd, sp->director->vcl_name, bp->vcl_name); -+// return (vc); -+// } - sp->vbe = vc; - VBE_ClosedFd(sp); - } | ||
| [+] | Deleted | varnish_2.0.4-2.diff.gz ^ |
| @@ -1,1359 +0,0 @@ ---- varnish-2.0.4.orig/debian/varnish.logrotate -+++ varnish-2.0.4/debian/varnish.logrotate -@@ -0,0 +1,15 @@ -+/var/log/varnish/varnish.log /var/log/varnish/varnishncsa.log { -+ daily -+ rotate 7 -+ missingok -+ compress -+ delaycompress -+ missingok -+ postrotate -+ for service in varnishlog varnishncsa; do -+ if /usr/bin/pgrep -P 1 $service >/dev/null; then -+ /usr/sbin/invoke-rc.d $service reload > /dev/null -+ fi -+ done -+ endscript -+} ---- varnish-2.0.4.orig/debian/varnish.install -+++ varnish-2.0.4/debian/varnish.install -@@ -0,0 +1,2 @@ -+usr/bin -+usr/sbin ---- varnish-2.0.4.orig/debian/varnish.manpages -+++ varnish-2.0.4/debian/varnish.manpages -@@ -0,0 +1,10 @@ -+bin/varnishtest/varnishtest.1 -+bin/varnishncsa/varnishncsa.1 -+bin/varnishhist/varnishhist.1 -+bin/varnishstat/varnishstat.1 -+bin/varnishreplay/varnishreplay.1 -+bin/varnishadm/varnishadm.1 -+bin/varnishlog/varnishlog.1 -+bin/varnishtop/varnishtop.1 -+bin/varnishd/varnishd.1 -+man/vcl.7 ---- varnish-2.0.4.orig/debian/copyright -+++ varnish-2.0.4/debian/copyright -@@ -0,0 +1,45 @@ -+This package was debianized by Lars Bahner <bahner@debian.org> on -+Fri, 6 Oct 2006 16:26:57 +0200. -+ -+It was pulled from the Subversion repository with -+svn co http://varnish.projects.linpro.no/svn/trunk -+ -+Debianizations are an integral part of the main source for varnish, -+so the change for Debian are made before publication of releases, -+and are as such checked. -+ -+Files are downloadable from the following URL -+http://sourceforge.net/project/showfiles.php?group_id=155816 -+ -+Copyright: 2006 Verdens Gang AS -+ 2006 Linpro AS -+All rights reserved. -+ -+License: -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions -+are met: -+1. Redistributions of source code must retain the above copyright -+ notice, this list of conditions and the following disclaimer. -+2. Redistributions in binary form must reproduce the above copyright -+ notice, this list of conditions and the following disclaimer in the -+ documentation and/or other materials provided with the distribution. -+ -+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE -+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+SUCH DAMAGE. -+ -+The Debian packaging is copyright -+ © 2006, Lars Bahner <bahner@debian.org> -+ © 2006-2009 Stig Sandbeck Mathisen <ssm@debian.org> -+and is licensed under the GPL version 2. The full text of which can be found in -+the file /usr/share/common-licenses/GPL-2 on this system. ---- varnish-2.0.4.orig/debian/libvarnish1.symbols -+++ varnish-2.0.4/debian/libvarnish1.symbols -@@ -0,0 +1,170 @@ -+libvarnish.so.1 libvarnish1 #MINVER# -+ FreeArgv@Base 2.0~rc1 -+ ParseArgv@Base 2.0~rc1 -+ SHA256_Final@Base 2.0.3 -+ SHA256_Init@Base 2.0.3 -+ SHA256_Test@Base 2.0.3 -+ SHA256_Update@Base 2.0.3 -+ SUB_run@Base 2.0.3 -+ TCP_blocking@Base 2.0~rc1 -+ TCP_close@Base 2.0~rc1 -+ TCP_connect@Base 2.0~rc1 -+ TCP_filter_http@Base 2.0~rc1 -+ TCP_myname@Base 2.0~rc1 -+ TCP_name@Base 2.0~rc1 -+ TCP_nonblocking@Base 2.0~rc1 -+ TCP_set_read_timeout@Base 2.0.3 -+ TIM_format@Base 2.0~rc1 -+ TIM_mono@Base 2.0~rc1 -+ TIM_parse@Base 2.0~rc1 -+ TIM_real@Base 2.0~rc1 -+ TIM_sleep@Base 2.0~rc1 -+ VLU_Destroy@Base 2.0~rc1 -+ VLU_Fd@Base 2.0~rc1 -+ VLU_File@Base 2.0~rc1 -+ VLU_New@Base 2.0~rc1 -+ VLU_SetTelnet@Base 2.0.4 -+ VSS_bind@Base 2.0~rc1 -+ VSS_connect@Base 2.0~rc1 -+ VSS_listen@Base 2.0~rc1 -+ VSS_open@Base 2.0~rc1 -+ VSS_parse@Base 2.0~rc1 -+ VSS_resolve@Base 2.0~rc1 -+ binheap_delete@Base 2.0~rc1 -+ binheap_insert@Base 2.0~rc1 -+ binheap_new@Base 2.0~rc1 -+ binheap_root@Base 2.0~rc1 -+ cli_concat@Base 2.0~rc1 -+ cli_dispatch@Base 2.0~rc1 -+ cli_func_help@Base 2.0~rc1 -+ cli_func_ping@Base 2.0~rc1 -+ cli_out@Base 2.0~rc1 -+ cli_param@Base 2.0~rc1 -+ cli_quote@Base 2.0~rc1 -+ cli_readres@Base 2.0~rc1 -+ cli_result@Base 2.0~rc1 -+ cli_writeres@Base 2.0~rc1 -+ crc32@Base 2.0~rc1 -+ crc32_l@Base 2.0~rc1 -+ flopen@Base 2.0~rc1 -+ inxorcise@Base 2.0.4 -+ lbv_assert@Base 2.0~rc1 -+ str2bytes@Base 2.0~rc1 -+ varnish_version@Base 2.0~rc1 -+ vct_typtab@Base 2.0~rc1 -+ vev_add@Base 2.0~rc1 -+ vev_del@Base 2.0~rc1 -+ vev_destroy_base@Base 2.0~rc1 -+ vev_new@Base 2.0~rc1 -+ vev_new_base@Base 2.0~rc1 -+ vev_schedule@Base 2.0~rc1 -+ vev_schedule_one@Base 2.0~rc1 -+ vpf_close@Base 2.0~rc1 -+ vpf_open@Base 2.0~rc1 -+ vpf_remove@Base 2.0~rc1 -+ vpf_write@Base 2.0~rc1 -+ vreadfile@Base 2.0.3 -+ vsb_bcat@Base 2.0~rc1 -+ vsb_bcpy@Base 2.0~rc1 -+ vsb_cat@Base 2.0~rc1 -+ vsb_clear@Base 2.0~rc1 -+ vsb_cpy@Base 2.0~rc1 -+ vsb_data@Base 2.0~rc1 -+ vsb_delete@Base 2.0~rc1 -+ vsb_done@Base 2.0~rc1 -+ vsb_finish@Base 2.0~rc1 -+ vsb_len@Base 2.0~rc1 -+ vsb_new@Base 2.0~rc1 -+ vsb_overflowed@Base 2.0~rc1 -+ vsb_printf@Base 2.0~rc1 -+ vsb_putc@Base 2.0~rc1 -+ vsb_quote@Base 2.0.3 -+ vsb_setpos@Base 2.0~rc1 -+ vsb_trim@Base 2.0~rc1 -+ vsb_vprintf@Base 2.0~rc1 -+ vtmpfile@Base 2.0~rc1 -+libvarnishapi.so.1 libvarnish1 #MINVER# -+ VSL_Arg@Base 2.0~rc1 -+ VSL_Dispatch@Base 2.0~rc1 -+ VSL_H_Print@Base 2.0~rc1 -+ VSL_Name@Base 2.0~rc1 -+ VSL_New@Base 2.0~rc1 -+ VSL_NextLog@Base 2.0~rc1 -+ VSL_NonBlocking@Base 2.0~rc1 -+ VSL_OpenLog@Base 2.0~rc1 -+ VSL_OpenStats@Base 2.0~rc1 -+ VSL_Select@Base 2.0~rc1 -+ VSL_tags@Base 2.0~rc1 -+ base64_decode@Base 2.0~rc1 -+ base64_init@Base 2.0~rc1 -+ varnish_instance@Base 2.0~rc1 -+libvarnishcompat.so.1 libvarnish1 #MINVER# -+ setproctitle@Base 2.0~rc1 -+ srandomdev@Base 2.0~rc1 -+ strlcat@Base 2.0~rc1 -+ strlcpy@Base 2.0~rc1 -+#MISSING: 2.0.3# strvis@Base 2.0~rc1 -+#MISSING: 2.0.3# strvisx@Base 2.0~rc1 -+#MISSING: 2.0.3# vis@Base 2.0~rc1 -+libvcl.so.1 libvarnish1 #MINVER# -+ EncToken@Base 2.0~rc1 -+ Fb@Base 2.0~rc1 -+ Fc@Base 2.0~rc1 | ||
| [+] | Deleted | varnishncsa-vhost-2.0.2.patch ^ |
| @@ -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); | ||
| [+] | Deleted | varnishncsa-vhost-2.0.6.patch ^ |
| @@ -1,48 +0,0 @@ ---- 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 | varnishncsa-vhost.patch.debug ^ |
| @@ -1,57 +0,0 @@ ---- 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 | varnish-2.0.1.tar.gz ^ | |
| Deleted | varnish-2.0.2.tar.gz ^ | |
| Deleted | varnish-2.0.3.tar.bz2 ^ | |
| Added | varnish-2.0.3_VSLP.tar.bz2 ^ | |
| Deleted | varnish-2.0.4.tar.bz2 ^ | |
| Deleted | varnish-2.0.6.tar.bz2 ^ | |
| Deleted | varnish-2.0.tar.gz ^ | |
| [+] | Deleted | varnish_2.0.4-2.dsc ^ |
| @@ -1,32 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -Format: 1.0 -Source: varnish -Binary: varnish, libvarnish1, libvarnish-dev -Architecture: any -Version: 2.0.4-2 -Maintainer: Stig Sandbeck Mathisen <ssm@debian.org> -Uploaders: Lars Bahner <bahner@debian.org>, Fabio Tranchitella <kobold@debian.org> -Homepage: http://varnish.projects.linpro.no/ -Standards-Version: 3.8.1 -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-varnish/packages/varnish/ -Vcs-Svn: svn://svn.debian.org/pkg-varnish/packages/varnish -Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, libtool, autoconf, libncurses-dev, xsltproc, groff-base, quilt -Checksums-Sha1: - 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 786945 varnish_2.0.4.orig.tar.gz - f57f76cf3222a7e537a9468608e86b5a2cee4b97 11174 varnish_2.0.4-2.diff.gz -Checksums-Sha256: - 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e 786945 varnish_2.0.4.orig.tar.gz - 5dc2f950ca8e42f4c7a8f9ec19d67b8704e3eec739daa6a505cb650cf80ef4b8 11174 varnish_2.0.4-2.diff.gz -Files: - 8044d59cb6d2ec6d09b7ae6033f06bbf 786945 varnish_2.0.4.orig.tar.gz - d00c49b8b20c4c6ce9125cf03ad155ac 11174 varnish_2.0.4-2.diff.gz - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEARECAAYFAkov68kACgkQQONU2fom4u7AwQCdGgIMk0ldaRp9s7cxCm0YjA/Y -C64An3hGUUN4Rwgkue68gUwSQY+sCqew -=KS1J ------END PGP SIGNATURE----- | ||
| Deleted | varnish_2.0.4.orig.tar.gz ^ | |