r1860 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-08-19 23:22:57 +0200 (Sun, 19 Aug 2007)
New Revision: 1860

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache_center.c
   branches/1.1/bin/varnishd/mgt_child.c
   branches/1.1/bin/varnishd/mgt_cli.c
Log:
Merged revisions 1857-1859 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1857 | des | 2007-08-19 20:18:11 +0200 (Sun, 19 Aug 2007) | 2 lines
  
  Whitespace cleanup.
........
  r1858 | phk | 2007-08-19 23:19:46 +0200 (Sun, 19 Aug 2007) | 2 lines
  
  Feed my virtual whitespace habbit.
........
  r1859 | phk | 2007-08-19 23:20:48 +0200 (Sun, 19 Aug 2007) | 4 lines
  
  Reset the cli buffer when we have soaked up all it contained.
  Otherwise we will for ever be repeating the same command over and over,
  no matter what the input to the cli might be.
........



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,1831-1838,1846,1853-1855
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859

Modified: branches/1.1/bin/varnishd/cache_center.c
===================================================================
--- branches/1.1/bin/varnishd/cache_center.c	2007-08-19 21:20:48 UTC (rev 1859)
+++ branches/1.1/bin/varnishd/cache_center.c	2007-08-19 21:22:57 UTC (rev 1860)
@@ -110,7 +110,7 @@
  * We have a refcounted object on the session, now deliver it.
  *
 DOT subgraph xcluster_deliver {
-DOT 	deliver [
+DOT	deliver [
 DOT		shape=ellipse
 DOT		label="Filter obj.->resp."
 DOT	]
@@ -132,7 +132,7 @@
  * XXX: Ideally we should make the req. available in vcl_deliver() but for
  * XXX: reasons of economy we don't, since that allows us to reuse the space
  * XXX: in sp->req for the response.
- * 
+ *
  * XXX: Rather than allocate two http's and workspaces for all sessions to
  * XXX: address this deficiency, we could make the VCL compiler set a flag
  * XXX: if req. is used in vcl_deliver().  When the flag is set we would
@@ -465,7 +465,7 @@
 		sp->lhashptr = 1;	/* space for NUL */
 		sp->ihashptr = 0;
 		sp->nhashptr = sp->vcl->nhashcount * 2;
-		p = WS_Alloc(sp->http->ws, 
+		p = WS_Alloc(sp->http->ws,
 		    sizeof(const char *) * (sp->nhashptr + 1));
 		XXXAN(p);
 		u = (uintptr_t)p;
@@ -507,7 +507,7 @@
 		sp->obj = NULL;
 		sp->step = STP_PASS;
 		return (0);
-	} 
+	}
 
 	VSL_stats->cache_hit++;
 	WSL(sp->wrk, SLT_Hit, sp->fd, "%u", sp->obj->xid);
@@ -639,7 +639,7 @@
 DOT		label="send bereq.\npipe until close"
 DOT	]
 DOT	vcl_pipe -> pipe_do [label="pipe"]
-DOT	pipe -> vcl_pipe 
+DOT	pipe -> vcl_pipe
 DOT }
 DOT pipe_do -> DONE
 DOT vcl_pipe -> err_pipe [label="error"]

Modified: branches/1.1/bin/varnishd/mgt_child.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_child.c	2007-08-19 21:20:48 UTC (rev 1859)
+++ branches/1.1/bin/varnishd/mgt_child.c	2007-08-19 21:22:57 UTC (rev 1860)
@@ -438,7 +438,6 @@
 mcf_server_startstop(struct cli *cli, char **av, void *priv)
 {
 
-	(void)cli;
 	(void)av;
 	if (priv != NULL && child_state == CH_RUNNING)
 		stop_child();

Modified: branches/1.1/bin/varnishd/mgt_cli.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_cli.c	2007-08-19 21:20:48 UTC (rev 1859)
+++ branches/1.1/bin/varnishd/mgt_cli.c	2007-08-19 21:22:57 UTC (rev 1860)
@@ -337,7 +337,8 @@
 		assert(q == cp->buf + cp->nbuf);
 		cp->nbuf -= (p - cp->buf);
 		memmove(cp->buf, p, cp->nbuf);
-	}
+	} else
+		cp->nbuf = 0;
 	return (0);
 
 cli_close: