r4003 - in branches/2.0/varnish-cache: bin/varnishd bin/varnishlog bin/varnishncsa bin/varnishtest/tests include lib/libvarnish
tfheen at projects.linpro.no
tfheen at projects.linpro.no
Fri Mar 27 13:13:31 CET 2009
Author: tfheen
Date: 2009-03-27 13:13:31 +0100 (Fri, 27 Mar 2009)
New Revision: 4003
Added:
branches/2.0/varnish-cache/bin/varnishtest/tests/r00445.vtc
branches/2.0/varnish-cache/lib/libvarnish/inxorcise.c
Removed:
branches/2.0/varnish-cache/bin/varnishtest/tests/r00445
Modified:
branches/2.0/varnish-cache/bin/varnishd/varnishd.c
branches/2.0/varnish-cache/bin/varnishlog/varnishlog.c
branches/2.0/varnish-cache/bin/varnishncsa/varnishncsa.c
branches/2.0/varnish-cache/include/libvarnish.h
branches/2.0/varnish-cache/lib/libvarnish/Makefile.am
Log:
Merge r3983-r3987: Apple has deprecated an old function in 10.5, go use launchd instead
Modified: branches/2.0/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/varnishd.c 2009-03-24 12:28:01 UTC (rev 4002)
+++ branches/2.0/varnish-cache/bin/varnishd/varnishd.c 2009-03-27 12:13:31 UTC (rev 4003)
@@ -645,7 +645,7 @@
if (d_flag == 1)
DebugStunt();
if (d_flag < 2 && !F_flag)
- AZ(daemon(1, d_flag));
+ AZ(inxorcise(1, d_flag));
if (d_flag == 1)
printf("%d\n", getpid());
Modified: branches/2.0/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishlog/varnishlog.c 2009-03-24 12:28:01 UTC (rev 4002)
+++ branches/2.0/varnish-cache/bin/varnishlog/varnishlog.c 2009-03-27 12:13:31 UTC (rev 4003)
@@ -372,7 +372,7 @@
exit(1);
}
- if (D_flag && daemon(0, 0) == -1) {
+ if (D_flag && inxorcise(0, 0) == -1) {
perror("daemon()");
if (pfh != NULL)
vpf_remove(pfh);
Modified: branches/2.0/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishncsa/varnishncsa.c 2009-03-24 12:28:01 UTC (rev 4002)
+++ branches/2.0/varnish-cache/bin/varnishncsa/varnishncsa.c 2009-03-27 12:13:31 UTC (rev 4003)
@@ -569,7 +569,7 @@
exit(1);
}
- if (D_flag && daemon(0, 0) == -1) {
+ if (D_flag && inxorcise(0, 0) == -1) {
perror("daemon()");
if (pfh != NULL)
vpf_remove(pfh);
Deleted: branches/2.0/varnish-cache/bin/varnishtest/tests/r00445
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/r00445 2009-03-24 12:28:01 UTC (rev 4002)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/r00445 2009-03-27 12:13:31 UTC (rev 4003)
@@ -1,24 +0,0 @@
-# $Id$
-
-test "zero length ESI include segmens with chunked encoding"
-
-server s1 {
- rxreq
- expect req.url == "/"
- txresp -body {<foo><esi:include src="/bar"><bar>}
- rxreq
- expect req.url == "/bar"
- txresp
-} -start
-
-varnish v1 -vcl+backend {
- sub vcl_fetch {
- esi;
- }
-} -start
-
-client c1 {
- txreq
- rxresp
- expect resp.bodylen == 10
-} -run
Copied: branches/2.0/varnish-cache/bin/varnishtest/tests/r00445.vtc (from rev 3987, trunk/varnish-cache/bin/varnishtest/tests/r00445.vtc)
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/r00445.vtc (rev 0)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/r00445.vtc 2009-03-27 12:13:31 UTC (rev 4003)
@@ -0,0 +1,24 @@
+# $Id$
+
+test "zero length ESI include segmens with chunked encoding"
+
+server s1 {
+ rxreq
+ expect req.url == "/"
+ txresp -body {<foo><esi:include src="/bar"><bar>}
+ rxreq
+ expect req.url == "/bar"
+ txresp
+} -start
+
+varnish v1 -vcl+backend {
+ sub vcl_fetch {
+ esi;
+ }
+} -start
+
+client c1 {
+ txreq
+ rxresp
+ expect resp.bodylen == 10
+} -run
Modified: branches/2.0/varnish-cache/include/libvarnish.h
===================================================================
--- branches/2.0/varnish-cache/include/libvarnish.h 2009-03-24 12:28:01 UTC (rev 4002)
+++ branches/2.0/varnish-cache/include/libvarnish.h 2009-03-27 12:13:31 UTC (rev 4003)
@@ -130,3 +130,5 @@
lbv_assert(__func__, __FILE__, __LINE__, expl, errno, 3); \
abort(); \
} while (0)
+
+int inxorcise(int nochdir, int noclose);
Modified: branches/2.0/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnish/Makefile.am 2009-03-24 12:28:01 UTC (rev 4002)
+++ branches/2.0/varnish-cache/lib/libvarnish/Makefile.am 2009-03-27 12:13:31 UTC (rev 4003)
@@ -15,6 +15,7 @@
cli_common.c \
crc32.c \
flopen.c \
+ inxorcise.c \
num.c \
time.c \
tcp.c \
Copied: branches/2.0/varnish-cache/lib/libvarnish/inxorcise.c (from rev 3984, trunk/varnish-cache/lib/libvarnish/inxorcise.c)
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnish/inxorcise.c (rev 0)
+++ branches/2.0/varnish-cache/lib/libvarnish/inxorcise.c 2009-03-27 12:13:31 UTC (rev 4003)
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2008 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ *
+ * This file only exists because Apple has decided to break a
+ * function that has an age old tradition and force the user
+ * to use launchd instead.
+ *
+ *
+ */
+
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include "libvarnish.h"
+
+#if __APPLE__ && __MAC_OS_X_VERSION_10_5
+int inxorcise(int nochdir __attribute__((unused)), int noclose __attribute__((unused))) {
+ fprintf(stderr, "Apple does not want programs to use daemon(3) and suggests using launchd(1). We don't agree, but their dad is bigger than our dad.\n");
+ exit(1);
+}
+#else
+int inxorcise(int nochdir, int noclose) {
+ return daemon(nochdir, noclose);
+}
+#endif
Property changes on: branches/2.0/varnish-cache/lib/libvarnish/inxorcise.c
___________________________________________________________________
Name: svn:keywords
+ id
More information about the varnish-commit
mailing list