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

[Krzysztof Krzyzaniak]

Author: eloy
Date: 2010-01-04 16:43:23 +0000 (Mon, 04 Jan 2010)
New Revision: 414

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.conf
   lighttpd/trunk/debian/use-ipv6.pl
Log:
fix for #560837

Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2010-01-04 16:27:34 UTC (rev 413)
+++ lighttpd/trunk/debian/changelog	2010-01-04 16:43:23 UTC (rev 414)
@@ -1,7 +1,6 @@
 lighttpd (1.4.25-2) unstable; urgency=low
 
-  * Disabled use-ipv6.pl script, if you need this please enable option for yourself
-    (closes: #560837)
+  * Change behaviour of use-ipv6.pl script (closes: #560837)
 
  -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Mon, 30 Nov 2009 14:23:03 +0100
 

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2010-01-04 16:27:34 UTC (rev 413)
+++ lighttpd/trunk/debian/lighttpd.conf	2010-01-04 16:43:23 UTC (rev 414)
@@ -64,7 +64,7 @@
 ######### Options that are good to be but not neccesary to be changed #######
 
 ## Use ipv6 only if available. (disabled for while, check #560837)
-# include_shell "/usr/share/lighttpd/use-ipv6.pl"
+include_shell "/usr/share/lighttpd/use-ipv6.pl"
 
 ## bind to port (default: 80)
 # server.port               = 81

Modified: lighttpd/trunk/debian/use-ipv6.pl
===================================================================
--- lighttpd/trunk/debian/use-ipv6.pl	2010-01-04 16:27:34 UTC (rev 413)
+++ lighttpd/trunk/debian/use-ipv6.pl	2010-01-04 16:43:23 UTC (rev 414)
@@ -4,5 +4,5 @@
 my $sock;
 
 if (socket($sock, AF_INET6, SOCK_STREAM, 0)) {
-    print "server.use-ipv6 = \"enable\"\n";
+    print q/$SERVER["socket"] == "[::]:80" { }/ . "\n";
 }