[pkg-lighttpd] r324 - lighttpd/trunk/debian

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-04-13 11:17:48 +0000 (Sun, 13 Apr 2008)
New Revision: 324

Added:
   lighttpd/trunk/debian/use-ipv6.pl
Removed:
   lighttpd/trunk/debian/psock.pl
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.conf
   lighttpd/trunk/debian/lighttpd.install
Log:
Detect ipv6 on the fly.



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-13 11:11:17 UTC (rev 323)
+++ lighttpd/trunk/debian/changelog	2008-04-13 11:17:48 UTC (rev 324)
@@ -20,6 +20,9 @@
   * Use $HTTP["remoteip"] =~ "127.0.0.1" in configuration snipplets so that it
     works when ipv6 is enabled by default too (Closes: 473510).
 
+  * Use perl to detect if the host has ipv6, and generate the server.use-ipv6
+    snipplet on the fly instead of forcing it to true (Closes: 473053).
+
  -- Pierre Habouzit <madcoder at debian.org>  Thu, 20 Mar 2008 00:53:45 +0100
 
 lighttpd (1.4.19-1~bpo40+1) etch-backports; urgency=low

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2008-04-13 11:11:17 UTC (rev 323)
+++ lighttpd/trunk/debian/lighttpd.conf	2008-04-13 11:17:48 UTC (rev 324)
@@ -63,8 +63,8 @@
 
 ######### Options that are good to be but not neccesary to be changed #######
 
-## Use ipv6
-server.use-ipv6            = "enable"
+## Use ipv6 only if available.
+include_shell "/usr/share/lighttpd/use-ipv6.pl"
 
 ## bind to port (default: 80)
 # server.port               = 81

Modified: lighttpd/trunk/debian/lighttpd.install
===================================================================
--- lighttpd/trunk/debian/lighttpd.install	2008-04-13 11:11:17 UTC (rev 323)
+++ lighttpd/trunk/debian/lighttpd.install	2008-04-13 11:17:48 UTC (rev 324)
@@ -42,5 +42,6 @@
 debian/conf-available/README                /etc/lighttpd/conf-available
 debian/create-mime.assign.pl                /usr/share/lighttpd/
 debian/include-conf-enabled.pl              /usr/share/lighttpd/
+debian/use-ipv6.pl                          /usr/share/lighttpd/
 debian/lighty-enable-mod                    /usr/sbin/
 debian/index.html                           /usr/share/lighttpd/

Deleted: lighttpd/trunk/debian/psock.pl
===================================================================
--- lighttpd/trunk/debian/psock.pl	2008-04-13 11:11:17 UTC (rev 323)
+++ lighttpd/trunk/debian/psock.pl	2008-04-13 11:17:48 UTC (rev 324)
@@ -1,5 +0,0 @@
-#!/usr/bin/perl -Tw
-use strict;
-use Socket;
-socket(Server, PF_INET, SOCK_STREAM, getprotobyname('tcp'));
-bind(Server, sockaddr_in(80, INADDR_ANY)) || exit 1 ;

Added: lighttpd/trunk/debian/use-ipv6.pl
===================================================================
--- lighttpd/trunk/debian/use-ipv6.pl	                        (rev 0)
+++ lighttpd/trunk/debian/use-ipv6.pl	2008-04-13 11:17:48 UTC (rev 324)
@@ -0,0 +1,8 @@
+#! /usr/bin/perl -w
+
+use Socket;
+my $sock;
+
+if (socket($sock, AF_INET6, SOCK_STREAM, 0)) {
+    print "server.use-ipv6 = \"enable\"\n";
+}


Property changes on: lighttpd/trunk/debian/use-ipv6.pl
___________________________________________________________________
Name: svn:executable
   + *