Author: atoell-guest
Date: 2012-03-27 23:00:13 +0000 (Tue, 27 Mar 2012)
New Revision: 573
Modified:
lighttpd/trunk/debian/changelog
lighttpd/trunk/debian/control
lighttpd/trunk/debian/lighttpd.conf
lighttpd/trunk/debian/use-ipv6.pl
Log:
Fix the annoying IPv6 problems by a smart(er) workaround
Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog 2012-02-11 12:33:52 UTC (rev 572)
+++ lighttpd/trunk/debian/changelog 2012-03-27 23:00:13 UTC (rev 573)
@@ -2,9 +2,14 @@
* NOT RELEASED YET
* Be more careful when removing dangling symlinks, as introduced in 1.4.30-1.
- Under some configurations the postrm script could fail previously.
+ Under some configurations the postrm script could fail previously.
+ * Change the use-ipv6.pl script to read the default listening port as a
+ command line argument, fall back to the old default behavior otherwise
+ (Closes: #632723, #642604). Thanks to Sebastian Pipping to accidentally
+ give a hint how to fix this old problem by driving by.
+ * Push standards version to 3.9.3.1 - no further changes
- -- Arno Töll <debian at toell.net> Sat, 11 Feb 2012 13:31:17 +0100
+ -- Arno Töll <debian at toell.net> Wed, 28 Mar 2012 00:51:28 +0200
lighttpd (1.4.30-1) unstable; urgency=medium
Modified: lighttpd/trunk/debian/control
===================================================================
--- lighttpd/trunk/debian/control 2012-02-11 12:33:52 UTC (rev 572)
+++ lighttpd/trunk/debian/control 2012-03-27 23:00:13 UTC (rev 573)
@@ -13,7 +13,7 @@
libxml2-dev, libkrb5-dev, perl, dpkg-dev (>= 1.16.1~)
Vcs-Svn: svn://svn.debian.org/pkg-lighttpd/lighttpd/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-lighttpd/lighttpd/trunk/
-Standards-Version: 3.9.2.0
+Standards-Version: 3.9.3.1
Package: lighttpd
Architecture: any
Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf 2012-02-11 12:33:52 UTC (rev 572)
+++ lighttpd/trunk/debian/lighttpd.conf 2012-03-27 23:00:13 UTC (rev 573)
@@ -12,7 +12,9 @@
server.pid-file = "/var/run/lighttpd.pid"
server.username = "www-data"
server.groupname = "www-data"
+server.port = 80
+
index-file.names = ( "index.php", "index.html", "index.lighttpd.html" )
url.access-deny = ( "~", ".inc" )
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
@@ -20,6 +22,7 @@
compress.cache-dir = "/var/cache/lighttpd/compress/"
compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
-include_shell "/usr/share/lighttpd/use-ipv6.pl"
+# default listening port for IPv6 falls back to the IPv4 port
+include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
Modified: lighttpd/trunk/debian/use-ipv6.pl
===================================================================
--- lighttpd/trunk/debian/use-ipv6.pl 2012-02-11 12:33:52 UTC (rev 572)
+++ lighttpd/trunk/debian/use-ipv6.pl 2012-03-27 23:00:13 UTC (rev 573)
@@ -1,8 +1,12 @@
#! /usr/bin/perl -w
use Socket;
+use strict;
+
my $sock;
+my $PORT = 80;
+$PORT = $ARGV[0] if $ARGV[0] and $ARGV[0] >= 0 and $ARGV[0] <= 65535;
if (socket($sock, AF_INET6, SOCK_STREAM, 0)) {
- print qq/\$SERVER["socket"] == "[::]:80" { }\n/;
+ print qq/\$SERVER["socket"] == "[::]:$PORT" { }\n/;
}