aboutsummaryrefslogtreecommitdiffstats
path: root/www/varnish2
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2007-08-29 23:45:47 +0800
committerdes <des@FreeBSD.org>2007-08-29 23:45:47 +0800
commitde18d87417c2bfff6baea829de716ec6d997287a (patch)
tree204df62a24973023ed75b17d19977c07839d3422 /www/varnish2
parent65bdcd37585acc630a1b46fa52919be7cf4e0723 (diff)
downloadfreebsd-ports-gnome-de18d87417c2bfff6baea829de716ec6d997287a.tar.gz
freebsd-ports-gnome-de18d87417c2bfff6baea829de716ec6d997287a.tar.zst
freebsd-ports-gnome-de18d87417c2bfff6baea829de716ec6d997287a.zip
Apply patch for Varnish bug #150.
Diffstat (limited to 'www/varnish2')
-rw-r--r--www/varnish2/Makefile2
-rw-r--r--www/varnish2/files/patch-svn-r191318
2 files changed, 19 insertions, 1 deletions
diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile
index 4d6b40d6aa2a..d4e869406d6a 100644
--- a/www/varnish2/Makefile
+++ b/www/varnish2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= varnish
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF
diff --git a/www/varnish2/files/patch-svn-r1913 b/www/varnish2/files/patch-svn-r1913
new file mode 100644
index 000000000000..318666826f0e
--- /dev/null
+++ b/www/varnish2/files/patch-svn-r1913
@@ -0,0 +1,18 @@
+Index: bin/varnishd/cache_center.c
+===================================================================
+--- bin/varnishd/cache_center.c (revision 1912)
++++ bin/varnishd/cache_center.c (revision 1913)
+@@ -524,7 +524,12 @@
+ */
+ WSL(sp->wrk, SLT_Debug, sp->fd,
+ "on waiting list on obj %u", sp->obj->xid);
+- assert(!isnan(sp->wrk->used));
++ /*
++ * There is a non-zero risk that we come here more than once
++ * before we get through, in that case cnt_recv must be set
++ */
++ if (isnan(sp->wrk->used))
++ sp->wrk->used = TIM_real();
+ SES_Charge(sp);
+ return (1);
+ }