Author: glen Date: Wed May 26 14:18:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4859
---- Files affected:
packages/varnish:
branch.diff (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/varnish/branch.diff
diff -u packages/varnish/branch.diff:1.7 packages/varnish/branch.diff:1.8
--- packages/varnish/branch.diff:1.7 Fri Jan 8 16:34:41 2010
+++ packages/varnish/branch.diff Wed May 26 16:18:25 2010
@@ -1,4 +1,4 @@
-# Revision 4439
+# Revision 4859
Index: doc/changes-2.0.5-2.0.6.xml
===================================================================
--- doc/changes-2.0.5-2.0.6.xml (.../tags/varnish-2.0.6/varnish-cache)
@@ -10,3 +10,31 @@
- <subsystem>
+ </subsystem>
</group>
+Index: bin/varnishtop/varnishtop.c
+===================================================================
+--- bin/varnishtop/varnishtop.c (.../tags/varnish-2.0.6/varnish-cache)
++++ bin/varnishtop/varnishtop.c (.../branches/2.0/varnish-cache)
+@@ -273,7 +273,9 @@
+ if (tp->count <= 1.0)
+ break;
+ len = SHMLOG_LEN(tp->rec);
+- printf("%9.2f %s %*.*s\n", tp->count,
VSL_tags[tp->rec[SHMLOG_TAG]], len, len, tp->rec + SHMLOG_DATA);
++ printf("%9.2f %s %*.*s\n",
++ tp->count, VSL_tags[tp->rec[SHMLOG_TAG]],
++ len, len, tp->rec_data);
+ }
+ }
+
+Index: bin/varnishd/cache_center.c
+===================================================================
+--- bin/varnishd/cache_center.c (.../tags/varnish-2.0.6/varnish-cache)
++++ bin/varnishd/cache_center.c (.../branches/2.0/varnish-cache)
+@@ -594,7 +594,7 @@
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+
+- if (sp->obj == NULL) {
++ if (sp->objhead == NULL) {
+ HSH_Prepare(sp, sp->vcl->nhashcount);
+ VCL_hash_method(sp);
+ assert(sp->handling == VCL_RET_HASH);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/branch.diff?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
