r1777 - in branches/1.1: . bin/varnishd bin/varnishhist bin/varnishreplay bin/varnishstat bin/varnishtop doc

des at projects.linpro.no des at projects.linpro.no
Thu Jul 26 15:54:14 CEST 2007 

Author: des
Date: 2007-07-26 15:54:14 +0200 (Thu, 26 Jul 2007)
New Revision: 1777

Added:
   branches/1.1/doc/changes-1.1-1.1.1.xml
   branches/1.1/doc/changes-1.1.1.xml
Modified:
   branches/1.1/
   branches/1.1/Makefile.am
   branches/1.1/bin/varnishd/cache_response.c
   branches/1.1/bin/varnishd/cache_vrt.c
   branches/1.1/bin/varnishhist/varnishhist.c
   branches/1.1/bin/varnishreplay/varnishreplay.c
   branches/1.1/bin/varnishstat/varnishstat.c
   branches/1.1/bin/varnishtop/varnishtop.c
   branches/1.1/doc/Makefile.am
   branches/1.1/doc/changes-1.0.4-1.1.xml
   branches/1.1/doc/changes-1.1.xml
Log:
Merged revisions 1745-1747,1750-1760,1763-1764,1767-1776 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1745 | des | 2007-07-24 13:39:55 +0200 (Tue, 24 Jul 2007) | 2 lines
  
  Implement VRT_r_obj_status(), without which obj.status can't be read.
........
  r1750 | des | 2007-07-24 15:54:20 +0200 (Tue, 24 Jul 2007) | 3 lines
  
  Always generate a Connection: header, in case the client makes an incorrect
  assumption about which is the default.
........
  r1751 | des | 2007-07-24 15:56:44 +0200 (Tue, 24 Jul 2007) | 3 lines
  
  RES_BuildHttp() must be called before RES_WriteObj() to prepare the response
  headers.  This fixes #128.
........
  r1752 | des | 2007-07-24 16:02:20 +0200 (Tue, 24 Jul 2007) | 2 lines
  
  #131: Honor DESTDIR when creating the state directory.
........
  r1753 | des | 2007-07-24 16:10:28 +0200 (Tue, 24 Jul 2007) | 2 lines
  
  #130: false is spelles FALSE in curses-land.
........
  r1754 | des | 2007-07-24 16:25:54 +0200 (Tue, 24 Jul 2007) | 6 lines
  
  Instead of incorrectly assuming that a pthread_t can be meaningfully cast
  to an unsigned int (which triggered warnings on some 64-bit platforms) and
  printed with %08lx, incorrectly assume that it can be meaningfully cast to
  a void * and printed with %p.  While still incorrect in general terms, the
  latter turns out to be correct on the specific systems that we care about.
........
  r1776 | des | 2007-07-26 15:53:41 +0200 (Thu, 26 Jul 2007) | 2 lines
  
  Add change log for 1.1.1 + various prop fixes
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1745-1747,1750-1760,1763-1764,1767-1776

Modified: branches/1.1/Makefile.am
===================================================================
--- branches/1.1/Makefile.am	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/Makefile.am	2007-07-26 13:54:14 UTC (rev 1777)
@@ -10,4 +10,4 @@
 EXTRA_DIST = LICENSE autogen.sh varnishapi.pc.in
 
 install-data-local:
-	$(install_sh) -d -m 0755 $(localstatedir)/varnish
+	$(install_sh) -d -m 0755 $(DESTDIR)$(localstatedir)/varnish

Modified: branches/1.1/bin/varnishd/cache_response.c
===================================================================
--- branches/1.1/bin/varnishd/cache_response.c	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/bin/varnishd/cache_response.c	2007-07-26 13:54:14 UTC (rev 1777)
@@ -50,6 +50,7 @@
 
 	/* synthesize error page and send it */
 	SYN_ErrorPage(sp, code, reason, 0);
+	RES_BuildHttp(sp);
 	RES_WriteObj(sp);
 
 	/* GC the error page */
@@ -76,8 +77,8 @@
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "X-Varnish: %u", sp->xid);
 	TIM_format(sp->obj->last_modified, lm);
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Last-Modified: %s", lm);
-	if (sp->doclose != NULL)
-		http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close");
+	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Connection: %s",
+	    sp->doclose ? "close" : "keep-alive");
 	sp->wantbody = 0;
 }
 
@@ -129,8 +130,8 @@
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Age: %.0f",
 	    sp->obj->age + sp->t_resp - sp->obj->entered);
 	http_SetHeader(sp->wrk, sp->fd, sp->http, "Via: 1.1 varnish");
-	if (sp->doclose != NULL)
-		http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close");
+	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Connection: %s",
+	    sp->doclose ? "close" : "keep-alive");
 }
 
 /*--------------------------------------------------------------------*/

Modified: branches/1.1/bin/varnishd/cache_vrt.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vrt.c	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/bin/varnishd/cache_vrt.c	2007-07-26 13:54:14 UTC (rev 1777)
@@ -234,6 +234,14 @@
 	http_SetH(&sp->obj->http, HTTP_HDR_STATUS, p);
 }
 
+int
+VRT_r_obj_status(struct sess *sp)
+{
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
+	return (atoi(sp->obj->http.hd[HTTP_HDR_STATUS].b));
+}
+
 void
 VRT_l_resp_status(struct sess *sp, int num)
 {

Modified: branches/1.1/bin/varnishhist/varnishhist.c
===================================================================
--- branches/1.1/bin/varnishhist/varnishhist.c	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/bin/varnishhist/varnishhist.c	2007-07-26 13:54:14 UTC (rev 1777)
@@ -247,7 +247,7 @@
 	raw();
 	noecho();
 	nonl();
-	intrflush(stdscr, false);
+	intrflush(stdscr, FALSE);
 	curs_set(0);
 	erase();
 	for (;;) {

Modified: branches/1.1/bin/varnishreplay/varnishreplay.c
===================================================================
--- branches/1.1/bin/varnishreplay/varnishreplay.c	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/bin/varnishreplay/varnishreplay.c	2007-07-26 13:54:14 UTC (rev 1777)
@@ -145,7 +145,7 @@
 	if (lvl > debug)
 		return;
 	pthread_mutex_lock(&log_mutex);
-	fprintf(stderr, "%08x ", (unsigned int)pthread_self());
+	fprintf(stderr, "%p ", (void *)pthread_self());
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
@@ -183,8 +183,8 @@
 			mailbox_destroy(&threads[fd]->mbox);
 			freez(threads[fd]);
 		}
-		thread_log(1, "thread %08x started\n",
-		    (unsigned int)threads[fd]->thread_id);
+		thread_log(1, "thread %p started\n",
+		    (void *)threads[fd]->thread_id);
 	}
 	return (threads[fd]);
 }
@@ -204,8 +204,8 @@
 		return;
 	mailbox_close(&threads[fd]->mbox);
 	pthread_join(threads[fd]->thread_id, NULL);
-	thread_log(1, "thread %08x stopped\n",
-	    (unsigned int)threads[fd]->thread_id);
+	thread_log(1, "thread %p stopped\n",
+	    (void *)threads[fd]->thread_id);
 	mailbox_destroy(&threads[fd]->mbox);
 	freez(threads[fd]);
 }

Modified: branches/1.1/bin/varnishstat/varnishstat.c
===================================================================
--- branches/1.1/bin/varnishstat/varnishstat.c	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/bin/varnishstat/varnishstat.c	2007-07-26 13:54:14 UTC (rev 1777)
@@ -78,7 +78,7 @@
 	raw();
 	noecho();
 	nonl();
-	intrflush(stdscr, false);
+	intrflush(stdscr, FALSE);
 	curs_set(0);
 	erase();
 

Modified: branches/1.1/bin/varnishtop/varnishtop.c
===================================================================
--- branches/1.1/bin/varnishtop/varnishtop.c	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/bin/varnishtop/varnishtop.c	2007-07-26 13:54:14 UTC (rev 1777)
@@ -201,7 +201,7 @@
 	raw();
 	noecho();
 	nonl();
-	intrflush(stdscr, false);
+	intrflush(stdscr, FALSE);
 	curs_set(0);
 	erase();
 	for (;;) {

Modified: branches/1.1/doc/Makefile.am
===================================================================
--- branches/1.1/doc/Makefile.am	2007-07-26 13:53:41 UTC (rev 1776)
+++ branches/1.1/doc/Makefile.am	2007-07-26 13:54:14 UTC (rev 1777)
@@ -1,7 +1,12 @@
 # $Id$
 
-CHANGELOGS = changes-1.0.4.html changes-1.1.html
+CHANGELOGS = \
+	changes-1.0.4.html \
+	changes-1.1.html \
+	changes-1.1.1.html
 
+all: ${CHANGELOGS}
+
 EXTRA_DIST = ${CHANGELOGS}
 
 CLEANFILES = ${CHANGELOGS}


Property changes on: branches/1.1/doc/changes-1.0.4-1.1.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml

Copied: branches/1.1/doc/changes-1.1-1.1.1.xml (from rev 1776, trunk/varnish-cache/doc/changes-1.1-1.1.1.xml)
===================================================================
--- branches/1.1/doc/changes-1.1-1.1.1.xml	                        (rev 0)
+++ branches/1.1/doc/changes-1.1-1.1.1.xml	2007-07-26 13:54:14 UTC (rev 1777)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE group [
+<!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<group from="1.1" to="1.1.1">
+  <subsystem>
+    <name>varnishd</name>
+
+    <change type="bug" ref="1745">
+      <para>The code required to allow VCL to read
+      <varname>obj.status</varname>, which had accidentally been left
+      out, has now been added.</para>
+    </change>
+
+    <change type="bug" ref="1750">
+      <para>Varnish will now always include a
+      <literal>Connection:</literal> header in its reply to the
+      client, to avoid possible misunderstandings.</para>
+    </change>
+
+    <change type="buf" ref="1751">
+      <para>A bug that triggered an assertion failure when generating
+      synthetic error documents has been corrected.</para>
+    </change>
+  </subsystem>
+</group>

Copied: branches/1.1/doc/changes-1.1.1.xml (from rev 1776, trunk/varnish-cache/doc/changes-1.1.1.xml)
===================================================================
--- branches/1.1/doc/changes-1.1.1.xml	                        (rev 0)
+++ branches/1.1/doc/changes-1.1.1.xml	2007-07-26 13:54:14 UTC (rev 1777)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xml" href="changes-html.xsl"?>
+<!DOCTYPE changelog [
+ <!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<changelog xmlns:xi="http://www.w3.org/2001/XInclude">
+  <package>Varnish</package>
+  <version>1.1.1</version>
+
+  <xi:include href="changes-1.1-1.1.1.xml"/>
+</changelog>


Property changes on: branches/1.1/doc/changes-1.1.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml

More information about the varnish-commit mailing list