diff options
Diffstat (limited to 'www/varnish2/files')
-rw-r--r-- | www/varnish2/files/patch-svn-r1913 | 18 | ||||
-rw-r--r-- | www/varnish2/files/varnishd.in | 43 | ||||
-rw-r--r-- | www/varnish2/files/varnishlog.in | 39 |
3 files changed, 0 insertions, 100 deletions
diff --git a/www/varnish2/files/patch-svn-r1913 b/www/varnish2/files/patch-svn-r1913 deleted file mode 100644 index 318666826f0e..000000000000 --- a/www/varnish2/files/patch-svn-r1913 +++ /dev/null @@ -1,18 +0,0 @@ -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); - } diff --git a/www/varnish2/files/varnishd.in b/www/varnish2/files/varnishd.in deleted file mode 100644 index babf2d908701..000000000000 --- a/www/varnish2/files/varnishd.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -# PROVIDE: varnishd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable varnishd: -# -#varnishd_enable="YES" -# -# Configuration variables and their default values: -# -#varnishd_listen=":6081" -#varnishd_config="%%PREFIX%%/etc/varnish/default.vcl" -#varnishd_telnet="localhost:6082" -#varnishd_storage="file,/tmp,50%" -#varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}" -# -# See varnishd(1) for a detailed overview of command-line options. -# - -. %%RC_SUBR%% - -name=varnishd -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/varnishd" -pidfile="/var/run/${name}.pid" - -# read configuration and set defaults -load_rc_config ${name} -: ${varnishd_enable="NO"} -: ${varnishd_listen=":6081"} -: ${varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"} -: ${varnishd_telnet="localhost:6082"} -: ${varnishd_storage="file,/tmp,50%"} -: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"} - -run_rc_command "$1" diff --git a/www/varnish2/files/varnishlog.in b/www/varnish2/files/varnishlog.in deleted file mode 100644 index 3c06c610f7bb..000000000000 --- a/www/varnish2/files/varnishlog.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -# PROVIDE: varnishlog -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable varnishlog: -# -#varnishlog_enable="YES" -# -# Configuration variables and their default values: -# -#varnishlog_file=${varnishlog_file:-"/var/log/varnish.log"} -#varnishlog_flags=${varnishlog_flags:-"-D -P ${pidfile} -a -w ${varnishlog_file}"} -# -# See varnishlog(1) for a detailed overview of command-line options. -# - -. %%RC_SUBR%% - -name=varnishlog -rcvar=`set_rcvar` - -command="%%PREFIX%%/bin/varnishlog" -pidfile="/var/run/${name}.pid" - -# read configuration and set defaults -load_rc_config ${name} -: ${varnishlog_enable="NO"} -: ${varnishlog_file="/var/log/varnish.log"} -: ${varnishlog_flags="-P ${pidfile} -D -a -w ${varnishlog_file}"} - -load_rc_config ${name} - -run_rc_command "$1" |