r2261 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-11-15 17:07:47 +0100 (Thu, 15 Nov 2007)
New Revision: 2261

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache_response.c
Log:
Merged revisions 2252,2255 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2252 | des | 2007-11-15 15:18:39 +0100 (Thu, 15 Nov 2007) | 2 lines
  
  Whitespace cleanup
........
  r2255 | des | 2007-11-15 17:02:05 +0100 (Thu, 15 Nov 2007) | 2 lines
  
  Change the assert() that triggers in #167 to spassert().
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246,2248-2251,2253-2254
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246,2248-2255

Modified: branches/1.2/bin/varnishd/cache_response.c
===================================================================
--- branches/1.2/bin/varnishd/cache_response.c	2007-11-15 16:06:08 UTC (rev 2260)
+++ branches/1.2/bin/varnishd/cache_response.c	2007-11-15 16:07:47 UTC (rev 2261)
@@ -126,10 +126,10 @@
 	http_CopyResp(sp->http, sp->obj->http);
 	http_FilterFields(sp->wrk, sp->fd, sp->http, sp->obj->http,
 	    HTTPH_A_DELIVER);
-	
+
 	TIM_format(TIM_real(), time_str);
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Date: %s", time_str);
-	
+
 	if (sp->xid != sp->obj->xid)
 		http_PrintfHeader(sp->wrk, sp->fd, sp->http,
 		    "X-Varnish: %u %u", sp->xid, sp->obj->xid);
@@ -181,7 +181,7 @@
 			VSL_stats->n_objwrite++;
 			WRK_Write(sp->wrk, st->ptr, st->len);
 		}
-		assert(u == sp->obj->len);
+		spassert(u == sp->obj->len);
 	}
 	if (WRK_Flush(sp->wrk))
 		vca_close_session(sp, "remote closed");