r1844 - in branches/1.1: . bin/varnishd debian

[des at projects.linpro.no]

Author: des
Date: 2007-08-13 21:20:58 +0200 (Mon, 13 Aug 2007)
New Revision: 1844

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache_http.c
   branches/1.1/bin/varnishd/cache_pool.c
   branches/1.1/debian/control
Log:
Merged revisions 1831-1838 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1831 | ssm | 2007-08-10 16:05:32 +0200 (Fri, 10 Aug 2007) | 1 line
  
  Added missing dependency on "libc6-dev | libc-dev" for vcl compilation
........
  r1837 | des | 2007-08-13 19:58:09 +0200 (Mon, 13 Aug 2007) | 2 lines
  
  Readability nit
........
  r1838 | des | 2007-08-13 20:00:50 +0200 (Mon, 13 Aug 2007) | 2 lines
  
  Correct three bits worth of line noise.  This fixes #129.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838

Modified: branches/1.1/bin/varnishd/cache_http.c
===================================================================
--- branches/1.1/bin/varnishd/cache_http.c	2007-08-13 18:37:26 UTC (rev 1843)
+++ branches/1.1/bin/varnishd/cache_http.c	2007-08-13 19:20:58 UTC (rev 1844)
@@ -326,7 +326,7 @@
 		return (0);
 
 	if (len == 0)
-		len = hp->pl_e - hp->pl_e;
+		len = hp->pl_e - hp->pl_s;
 
 	if (hp->pl_s + len > hp->pl_e)
 		len = hp->pl_e - hp->pl_s;

Modified: branches/1.1/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.1/bin/varnishd/cache_pool.c	2007-08-13 18:37:26 UTC (rev 1843)
+++ branches/1.1/bin/varnishd/cache_pool.c	2007-08-13 19:20:58 UTC (rev 1844)
@@ -135,8 +135,9 @@
 	if (w->niov == MAX_IOVS)
 		WRK_Flush(w);
 	w->iov[w->niov].iov_base = (void*)(uintptr_t)ptr;
-	w->iov[w->niov++].iov_len = len;
+	w->iov[w->niov].iov_len = len;
 	w->liov += len;
+	w->niov++;
 	return (len);
 }
 

Modified: branches/1.1/debian/control
===================================================================
--- branches/1.1/debian/control	2007-08-13 18:37:26 UTC (rev 1843)
+++ branches/1.1/debian/control	2007-08-13 19:20:58 UTC (rev 1844)
@@ -8,7 +8,7 @@
 
 Package: varnish
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3), libvarnish
+Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3), libvarnish, libc6-dev | libc-dev
 Description: A state-of-the-art, high-performance HTTP accelerator
  varnish is the server-side alternative to Squid, written primarily with
  speed in mind, and with a look to implementing full ESI-support in