packages: varnish/branch.sh, varnish/branch.diff - 2.0.5 branch diff

glen glen at pld-linux.org
Sat Dec 19 21:57:36 CET 2009 

Author: glen                         Date: Sat Dec 19 20:57:36 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.0.5 branch diff

---- Files affected:
packages/varnish:
   branch.sh (1.3 -> 1.4) , branch.diff (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/varnish/branch.sh
diff -u packages/varnish/branch.sh:1.3 packages/varnish/branch.sh:1.4
--- packages/varnish/branch.sh:1.3	Fri Nov  6 12:17:10 2009
+++ packages/varnish/branch.sh	Sat Dec 19 21:57:31 2009
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 svn=http://varnish.projects.linpro.no/svn
-tag=varnish-2.0.4/varnish-cache
+tag=varnish-2.0.5/varnish-cache
 branch=2.0/varnish-cache
 out=branch.diff
 

================================================================
Index: packages/varnish/branch.diff
diff -u packages/varnish/branch.diff:1.5 packages/varnish/branch.diff:1.6
--- packages/varnish/branch.diff:1.5	Fri Nov  6 15:20:33 2009
+++ packages/varnish/branch.diff	Sat Dec 19 21:57:31 2009
@@ -1,387 +1,114 @@
-# Revision 4343
-Index: include/vsb.h
-===================================================================
---- include/vsb.h	(.../tags/varnish-2.0.4/varnish-cache)
-+++ include/vsb.h	(.../branches/2.0/varnish-cache)
-@@ -77,7 +77,8 @@
- int		 vsb_len(struct vsb *);
- int		 vsb_done(const struct vsb *);
- void		 vsb_delete(struct vsb *);
--void		 vsb_quote(struct vsb *s, const char *p, int how);
-+void		 vsb_quote(struct vsb *s, const char *p, int len, int how);
-+const char	*vsb_unquote(struct vsb *s, const char *p, int len, int how);
- #ifdef __cplusplus
- };
- #endif
+# Revision 4419
 Index: include/compat/execinfo.h
 ===================================================================
---- include/compat/execinfo.h	(.../tags/varnish-2.0.4/varnish-cache)
+--- include/compat/execinfo.h	(.../tags/varnish-2.0.5/varnish-cache)
 +++ include/compat/execinfo.h	(.../branches/2.0/varnish-cache)
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright (c) 2003 Maxim Sobolev <sobomax at FreeBSD.org>
-+ * All rights reserved.
-+ *
-+ * 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 THE 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.
-+ *
-+ * $Id$
-+ */
-+
-+#ifndef COMPAT_EXECINFO_H_INCLUDED
-+#define COMPAT_EXECINFO_H_INCLUDED
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+int     backtrace(void **, int);
-+char ** backtrace_symbols(void *const *, int);
-+void    backtrace_symbols_fd(void *const *, int, int);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* COMPAT_EXECINFO_H_INCLUDED */
-Index: include/libvarnish.h
-===================================================================
---- include/libvarnish.h	(.../tags/varnish-2.0.4/varnish-cache)
-+++ include/libvarnish.h	(.../branches/2.0/varnish-cache)
-@@ -42,6 +42,8 @@
- /* from libvarnish/argv.c */
- void FreeArgv(char **argv);
- char **ParseArgv(const char *s, int flag);
-+char *BackSlashDecode(const char *s, const char *e);
-+int BackSlash(const char *s, char *res);
- #define ARGV_COMMENT	(1 << 0)
- #define ARGV_COMMA	(1 << 1)
- 
-@@ -65,6 +67,7 @@
- int TCP_filter_http(int sock);
- void TCP_blocking(int sock);
- void TCP_nonblocking(int sock);
-+void TCP_linger(int sock, int linger);
- #ifdef SOL_SOCKET
- void TCP_name(const struct sockaddr *addr, unsigned l, char *abuf,
-     unsigned alen, char *pbuf, unsigned plen);
-Index: include/vrt_obj.h
-===================================================================
---- include/vrt_obj.h	(.../tags/varnish-2.0.4/varnish-cache)
-+++ include/vrt_obj.h	(.../branches/2.0/varnish-cache)
-@@ -24,6 +24,8 @@
- double VRT_r_req_grace(struct sess *);
- void VRT_l_req_grace(struct sess *, double);
- const char * VRT_r_req_xid(struct sess *);
-+unsigned VRT_r_req_esi(struct sess *);
-+void VRT_l_req_esi(struct sess *, unsigned);
- const char * VRT_r_bereq_request(const struct sess *);
- void VRT_l_bereq_request(const struct sess *, const char *, ...);
- const char * VRT_r_bereq_url(const struct sess *);
-Index: include/shmlog_tags.h
-===================================================================
---- include/shmlog_tags.h	(.../tags/varnish-2.0.4/varnish-cache)
-+++ include/shmlog_tags.h	(.../branches/2.0/varnish-cache)
-@@ -101,3 +101,5 @@
- SLTM(Hash)
+@@ -35,7 +35,6 @@
  
- SLTM(Backend_health)
-+
-+SLTM(FetchError)
+ int     backtrace(void **, int);
+ char ** backtrace_symbols(void *const *, int);
+-void    backtrace_symbols_fd(void *const *, int, int);
+ 
+ #ifdef __cplusplus
+ }
 Index: include/vrt.h
 ===================================================================
---- include/vrt.h	(.../tags/varnish-2.0.4/varnish-cache)
+--- include/vrt.h	(.../tags/varnish-2.0.5/varnish-cache)
 +++ include/vrt.h	(.../branches/2.0/varnish-cache)
-@@ -54,6 +54,7 @@
+@@ -52,6 +52,7 @@
+ 	const char	*request;
+ 	double		timeout;
  	double		interval;
++	unsigned	exp_status;
  	unsigned	window;
  	unsigned	threshold;
-+	unsigned	initial;
- };
- 
- /*
-Index: include/stat_field.h
-===================================================================
---- include/stat_field.h	(.../tags/varnish-2.0.4/varnish-cache)
-+++ include/stat_field.h	(.../branches/2.0/varnish-cache)
-@@ -30,21 +30,33 @@
-  */
- 
- MAC_STAT(client_conn,		uint64_t, 'a', "Client connections accepted")
-+MAC_STAT(client_drop,		uint64_t, 'a', "Connection dropped, no sess")
- MAC_STAT(client_req,		uint64_t, 'a', "Client requests received")
- 
- MAC_STAT(cache_hit,		uint64_t, 'a', "Cache hits")
- MAC_STAT(cache_hitpass,		uint64_t, 'a', "Cache hits for pass")
- MAC_STAT(cache_miss,		uint64_t, 'a', "Cache misses")
- 
--MAC_STAT(backend_conn,		uint64_t, 'a', "Backend connections success")
--MAC_STAT(backend_unhealthy,	uint64_t, 'a',
--    "Backend connections not attempted")
--MAC_STAT(backend_busy,		uint64_t, 'a', "Backend connections too many")
--MAC_STAT(backend_fail,		uint64_t, 'a', "Backend connections failures")
--MAC_STAT(backend_reuse,		uint64_t, 'a', "Backend connections reuses")
--MAC_STAT(backend_recycle,	uint64_t, 'a', "Backend connections recycles")
--MAC_STAT(backend_unused,	uint64_t, 'a', "Backend connections unused")
-+MAC_STAT(backend_conn,		uint64_t, 'a', "Backend conn. success")
-+MAC_STAT(backend_unhealthy,	uint64_t, 'a', "Backend conn. not attempted")
-+MAC_STAT(backend_busy,		uint64_t, 'a', "Backend conn. too many")
-+MAC_STAT(backend_fail,		uint64_t, 'a', "Backend conn. failures")
-+MAC_STAT(backend_reuse,		uint64_t, 'a', "Backend conn. reuses")
-+MAC_STAT(backend_toolate,	uint64_t, 'a', "Backend conn. was closed")
-+MAC_STAT(backend_recycle,	uint64_t, 'a', "Backend conn. recycles")
-+MAC_STAT(backend_unused,	uint64_t, 'a', "Backend conn. unused")
- 
-+
-+MAC_STAT(fetch_head,		uint64_t, 'a', "Fetch head")
-+MAC_STAT(fetch_length,		uint64_t, 'a', "Fetch with Length")
-+MAC_STAT(fetch_chunked,		uint64_t, 'a', "Fetch chunked")
-+MAC_STAT(fetch_eof,		uint64_t, 'a', "Fetch EOF")
-+MAC_STAT(fetch_bad,		uint64_t, 'a', "Fetch had bad headers")
-+MAC_STAT(fetch_close,		uint64_t, 'a', "Fetch wanted close")
-+MAC_STAT(fetch_oldhttp,		uint64_t, 'a', "Fetch pre HTTP/1.1 closed")
-+MAC_STAT(fetch_zero,		uint64_t, 'a', "Fetch zero len")
-+MAC_STAT(fetch_failed,		uint64_t, 'a', "Fetch failed")
-+
- MAC_STAT(n_srcaddr,		uint64_t, 'i', "N struct srcaddr")
- MAC_STAT(n_srcaddr_act,		uint64_t, 'i', "N active struct srcaddr")
- MAC_STAT(n_sess_mem,		uint64_t, 'i', "N struct sess_mem")
-Index: include/Makefile.am
-===================================================================
---- include/Makefile.am	(.../tags/varnish-2.0.4/varnish-cache)
-+++ include/Makefile.am	(.../branches/2.0/varnish-cache)
-@@ -14,6 +14,7 @@
- 	cli_priv.h \
- 	compat/asprintf.h \
- 	compat/daemon.h \
-+	compat/execinfo.h \
- 	compat/setproctitle.h \
- 	compat/srandomdev.h \
- 	compat/strlcat.h \
+ 	unsigned	initial;
 Index: configure.ac
 ===================================================================
---- configure.ac	(.../tags/varnish-2.0.4/varnish-cache)
+--- configure.ac	(.../tags/varnish-2.0.5/varnish-cache)
 +++ configure.ac	(.../branches/2.0/varnish-cache)
-@@ -81,6 +81,7 @@
- AC_CHECK_HEADERS([sys/statvfs.h])
- AC_CHECK_HEADERS([sys/vfs.h])
- AC_CHECK_HEADERS([endian.h])
-+AC_CHECK_HEADERS([execinfo.h])
- AC_CHECK_HEADERS([netinet/in.h])
- AC_CHECK_HEADERS([pthread_np.h])
- AC_CHECK_HEADERS([stddef.h])
-@@ -102,6 +103,7 @@
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([strerror])
- AC_FUNC_STRERROR_R
-+AC_CHECK_FUNCS([dladdr])
- AC_CHECK_FUNCS([socket])
- AC_CHECK_FUNCS([strptime])
- AC_CHECK_FUNCS([fmtcheck])
-@@ -360,6 +362,15 @@
- fi
- AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
- 
-+# Define HTTP_HDR_MAX_VAL
-+AC_ARG_WITH(max-header-fields,
-+            AS_HELP_STRING([--with-max-header-fields=NUM],
-+                           [How many header fields to support (default=32)]),
-+            [],
-+            [with_max_header_fields=32])
-+
-+AC_DEFINE_UNQUOTED(HTTP_HDR_MAX_VAL, $with_max_header_fields, [Define maximum number of header fields supported by varnish ])
-+
- # Use jemalloc on Linux
- JEMALLOC_SUBDIR=
- JEMALLOC_LDADD=
-Index: doc/changes-2.0.4-2.0.5.xml
+@@ -1,9 +1,9 @@
+ # $Id$
+ 
+ AC_PREREQ(2.59)
+-AC_COPYRIGHT([Copyright (c) 2006-2008 Linpro AS / Verdens Gang AS])
++AC_COPYRIGHT([Copyright (c) 2006-2009 Linpro AS / Verdens Gang AS])
+ AC_REVISION([$Id$])
+-AC_INIT([Varnish], [2.0.5], [varnish-dev at projects.linpro.no])
++AC_INIT([Varnish], [2.0.6], [varnish-dev at projects.linpro.no])
+ AC_CONFIG_SRCDIR(include/varnishapi.h)
+ AM_CONFIG_HEADER(config.h)
+ 
+@@ -175,6 +175,7 @@
+ AC_CHECK_FUNCS([strlcat strlcpy])
+ AC_CHECK_FUNCS([strndup])
+ AC_CHECK_FUNCS([daemon])
++AC_CHECK_FUNCS([backtrace])
+ AC_SYS_LARGEFILE
+ 
+ save_LIBS="${LIBS}"
+Index: doc/changes-2.0.5-2.0.6.xml
 ===================================================================
---- doc/changes-2.0.4-2.0.5.xml	(.../tags/varnish-2.0.4/varnish-cache)
-+++ doc/changes-2.0.4-2.0.5.xml	(.../branches/2.0/varnish-cache)
-@@ -0,0 +1,161 @@
+--- doc/changes-2.0.5-2.0.6.xml	(.../tags/varnish-2.0.5/varnish-cache)
++++ doc/changes-2.0.5-2.0.6.xml	(.../branches/2.0/varnish-cache)
+@@ -0,0 +1,53 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!DOCTYPE group [
 +<!ENTITY mdash "&#8212;">
 +]>
 +<!-- $Id$ -->
-+<group from="2.0.4" to="2.0.5">
++<group from="2.0.5" to="2.0.6">
 +  <subsystem>
 +    <name>varnishd</name>
 +
-+    <change type="bug" ref="498">
-+      <para>Handle object workspace overruns better.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Allow turning off ESI processing per request by using
-+      <code>set req.esi = off</code>.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Tell the kernel that we expect to use the mmap-ed file in
-+      a random fashion.  On Linux, this turns off/down readahead and
-+      increases performance.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Make it possible to change the maximum number of HTTP
-+      headers we allow by
-+      passing <code>--with-max-header-fields=NUM</code> rather than
-+      changing the code.</para>
-+    </change>
-+
-+    <change type="enh" ref="428">
-+      <para>Implement support for HTTP continuation lines.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Change how connections are closed and only use SO_LINGER
-+      for orderly connection closure.  This should hopefully make
-+      worker threads less prone to hangups on network problems.</para>
-+    </change>
-+
-+    <change type="bug" ref="502">
-+      <para>Handle multi-element purges correctly.  Previously we
-+      ended up with parse errors when this was done from VCL.</para>
-+    </change>
-+
-+    <change type="bug" ref="506, 549">
-+      <para>Handle illegal responses from the backend better by
-+      serving a 503 page rather than panic-ing.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>When we run into an assertion that is not true, Varnish
-+      would previously dump a little bit of information about itself.
-+      Extend that information with a backtrace.  Note that this relies
-+      on the varnish binary being unstripped.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Add a session_max parameter that limits the maximum
-+      number of sessions we keep open before we start dropping new
-+      connections summarily.</para>
-+    </change>
-+
-+    <change type="bug">
-+      <para>Try to consume less memory when doing ESI processing by
-+      properly rolling back used workspace after processing an
-+      object.  This should make it possible to
-+      turn <code>sess_workspace</code> quite a bit for users with
-+      ESI-heavy pages.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Turn on <code>session_linger</code> by default.  Tests
-+      have shown that <code>session_linger</code> helps a fair bit
-+      with performance.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Rewrite the epoll acceptor for better performance.  This
-+      should lead to both higher processing rates and maximum number
-+      of connections on Linux.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Add If-None-Match support, this gives significant
-+      bandwidth savings for users with compliant browsers.</para>
-+    </change>
-+
-+    <change type="bug" ref="529">
-+      <para>RFC2616 specifies
-+      that <code>ETag</code>, <code>Content-Location</code>, <code>Expires</code>, <code>Cache-Control</code>
-+      and <code>Vary</code> should be emitted when delivering a
-+      response with the 304 response code.</para>
-+    </change>
-+
-+    <change type="bug" ref="531">
-+      <para>Various fixes which makes Varnish compile and work on AIX.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Turn on TCP_DEFER_ACCEPT on Linux.  This should make us
-+      less suspecible to denial of service attacks as well as give us
-+      slightly better performance.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>Add an <code>.initial</code> property to the backend
-+      probe specification.  This is the number of good probes we
-+      pretend to have seen.  The default is one less than .threshold,
-+      which means the first probe will decide if we consider the
-+      backend healthy.</para>
++    <change type="bug" ref="585">
++      <para>2.0.5 had an off-by-one error in the ESI handling causing
++      includes to fail a large part of the time. This has now been
++      fixed.</para>
 +    </change>
 +
-+    <change type="enh">
-+      <para>Make it possible to compare strings against other
-+      string-like objects, not just plain strings.  This allows you to
-+      compare two headers, for instance.</para>
++    <change type="bug" ref="584">
++      <para>Try harder to not confuse backends when sending them
++      backend probes.  We half-closed the connection, something some
++      backends thought meant we had dropped the connection.  Stop
++      doing so, and add the capability for specifying the expected
++      response code.</para>
 +    </change>
 +
 +    <change type="bug">
-+      <para>When support for <code>restart</code>
-+      in <code>vcl_error</code> was added, there was no check to
-+      prevent infinte recursion.  This has now been fixed.
-+     </para>
++      <para>In 2.0.5, session lingering was turned on.  This caused
++      statistics to not be counted often enough in some cases.  This
++      has now been fixed.</para>
 +    </change>
 +
-+    <change type="enh">
-+      <para>Turn on purge_dups by default.  This should make us
-+      consume less memory when there are many bans for the same
-+      pattern added.</para>
++    <change type="bug" ref="547">
++      <para>Avoid triggering an assert if the other end closes the
++      connection while we are lingering and waiting for another
++      request from them.</para>
 +    </change>
 +
-+    <change type="enh">
-+      <para>Add a new log tag called <code>FetchError</code> which
-+      tries to explain why we could not fetch an object from the
-+      backend.</para>
++    <change type="bug" ref="577">
++      <para>When generating backtraces, prefer the built-in backtrace
++      function if such exists.  This fixes a problem compiling 2.0.5
++      on Solaris.</para>
 +    </change>
 +
-+    <change type="enh">
-+      <para>Change the default <code>srcaddr_ttl</code> to 0.  It is
-+      not used by anything and has been removed in the development
-+      version.  This will increase performance somewhat.</para>
++    <change type="enh" ref="572">
++      <para>Make it possible to specify the per-thread stack size.
++      This might be useful on 32 bit systems with their limited
++      address space.</para>
 +    </change>
 +
-+  </subsystem>
-+
-+  <subsystem>
-+    <name>varnishtop</name>
-+    <change type="bug" ref="514">
-+      <para>varnishtop did not handle variable-length log fields
-+      correctly. This is now fixed.</para>
-+    </change>
-+
-+    <change type="enh">
-+      <para>varnishtop previously did not print the name of the tag,
-+      which made it very hard to understand.  We now print out the
-+      tag name.</para>
++    <change type="bug" ref="559">
++      <para>Document the <code>-C</code> option
++      to <code>varnishd</code>.</para>
 +    </change>
 +  </subsystem>
 +</group>
-Index: doc/changes-2.0.5.xml
+Index: doc/changes-2.0.6.xml
 ===================================================================
---- doc/changes-2.0.5.xml	(.../tags/varnish-2.0.4/varnish-cache)
-+++ doc/changes-2.0.5.xml	(.../branches/2.0/varnish-cache)
+--- doc/changes-2.0.6.xml	(.../tags/varnish-2.0.5/varnish-cache)
++++ doc/changes-2.0.6.xml	(.../branches/2.0/varnish-cache)
 @@ -0,0 +1,12 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<?xml-stylesheet type="text/xml" href="changes-html.xsl"?>
@@ -391,4536 +118,791 @@
 +<!-- $Id$ -->
 +<changelog xmlns:xi="http://www.w3.org/2001/XInclude">
 +  <package>Varnish</package>
-+  <version>2.0.5</version>
++  <version>2.0.6</version>
 +
-+  <xi:include href="changes-2.0.4-2.0.5.xml"/>
++  <xi:include href="changes-2.0.5-2.0.6.xml"/>
 +</changelog>
 Index: doc/Makefile.am
 ===================================================================
---- doc/Makefile.am	(.../tags/varnish-2.0.4/varnish-cache)
+--- doc/Makefile.am	(.../tags/varnish-2.0.5/varnish-cache)
 +++ doc/Makefile.am	(.../branches/2.0/varnish-cache)
 @@ -1,6 +1,7 @@
  # $Id$
  
  CHANGELOGS = \
-+	changes-2.0.5.html \
++	changes-2.0.6.html \
+ 	changes-2.0.5.html \
  	changes-2.0.4.html \
  	changes-2.0.3.html \
- 	changes-2.0.2.html \
-@@ -12,6 +13,7 @@
+@@ -13,6 +14,7 @@
  	changes-1.0.4.html
  
  XML = \
-+	changes-2.0.4-2.0.5.xml \
++	changes-2.0.5-2.0.6.xml \
+ 	changes-2.0.4-2.0.5.xml \
  	changes-2.0.3-2.0.4.xml \
  	changes-2.0.2-2.0.3.xml \
- 	changes-2.0.1-2.0.2.xml \
-Index: lib/libvarnish/argv.c
-===================================================================
---- lib/libvarnish/argv.c	(.../tags/varnish-2.0.4/varnish-cache)
-+++ lib/libvarnish/argv.c	(.../branches/2.0/varnish-cache)
-@@ -43,11 +43,12 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <stdint.h>
- 
- #include "libvarnish.h"
- 
--static int
-+int
- BackSlash(const char *s, char *res)
- {
- 	int r;
-@@ -103,13 +104,16 @@
- 	return (r);
- }
- 
--static char *
-+char *
- BackSlashDecode(const char *s, const char *e)
- {
- 	const char *q;
- 	char *p, *r;
- 	int i;
- 
-+	if (e == NULL)
-+		e = strchr(s, '\0');
-+	assert(e != NULL);
- 	p = calloc((e - s) + 1, 1);
- 	if (p == NULL)
- 		return (p);
-Index: lib/libvarnish/cli_common.c
-===================================================================
---- lib/libvarnish/cli_common.c	(.../tags/varnish-2.0.4/varnish-cache)
-+++ lib/libvarnish/cli_common.c	(.../branches/2.0/varnish-cache)
-@@ -73,7 +73,7 @@
- cli_quote(struct cli *cli, const char *s)
- {
- 
--	vsb_quote(cli->sb, s, 0);
-+	vsb_quote(cli->sb, s, -1, 0);
- }
- 
- void
 Index: lib/libvarnish/tcp.c
 ===================================================================
---- lib/libvarnish/tcp.c	(.../tags/varnish-2.0.4/varnish-cache)
+--- lib/libvarnish/tcp.c	(.../tags/varnish-2.0.5/varnish-cache)
 +++ lib/libvarnish/tcp.c	(.../branches/2.0/varnish-cache)
-@@ -36,6 +36,10 @@
- 
- #include <netinet/in.h>
- 
-+#ifdef __linux
-+#include <netinet/tcp.h>
-+#endif
-+
- #include <errno.h>
- #include <sys/ioctl.h>
- #ifdef HAVE_SYS_FILIO_H
-@@ -113,6 +117,10 @@
- 		printf("Acceptfilter(%d, httpready): %d %s\n",
- 		    sock, i, strerror(errno));
- 	return (i);
-+#elif defined(__linux)
-+	int defer = 1;
-+	setsockopt(sock, SOL_TCP,TCP_DEFER_ACCEPT,(char *) &defer, sizeof(int));
-+	return (0);
- #else
- 	(void)sock;
- 	return (0);
-@@ -222,3 +230,17 @@
- 	AZ(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof timeout));
- #endif
- }
-+
-+/*--------------------------------------------------------------------
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/branch.sh?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/branch.diff?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list