[pkg-lighttpd] r323 - in lighttpd/trunk/debian: . conf-available

[madcoder at alioth.debian.org]

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

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/conf-available/10-cgi.conf
   lighttpd/trunk/debian/lighttpd.conf
Log:
closes 473510



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-13 11:07:44 UTC (rev 322)
+++ lighttpd/trunk/debian/changelog	2008-04-13 11:11:17 UTC (rev 323)
@@ -17,6 +17,9 @@
   * init.d: stopping an already stopped lighttpd, or starting an already
     running one should not fail (Closes: 472122).
 
+  * Use $HTTP["remoteip"] =~ "127.0.0.1" in configuration snipplets so that it
+    works when ipv6 is enabled by default too (Closes: 473510).
+
  -- 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/conf-available/10-cgi.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-cgi.conf	2008-04-13 11:07:44 UTC (rev 322)
+++ lighttpd/trunk/debian/conf-available/10-cgi.conf	2008-04-13 11:11:17 UTC (rev 323)
@@ -8,7 +8,7 @@
 
 alias.url       += ( "/cgi-bin/" => "/usr/lib/cgi-bin/" )
 
-$HTTP["remoteip"] == "127.0.0.1" {
+$HTTP["remoteip"] =~ "127.0.0.1" {
 	alias.url += ( "/cgi-bin/" => "/usr/lib/cgi-bin/" )
 	$HTTP["url"] =~ "^/cgi-bin/" {
 		cgi.assign = ( "" => "" )

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2008-04-13 11:07:44 UTC (rev 322)
+++ lighttpd/trunk/debian/lighttpd.conf	2008-04-13 11:11:17 UTC (rev 323)
@@ -154,7 +154,8 @@
 #### handle Debian Policy Manual, Section 11.5. urls
 ## by default allow them only from localhost
 ## (This must come last due to #445459)
-$HTTP["remoteip"] == "127.0.0.1" {
+## Note: =~ "127.0.0.1" works with ipv6 enabled, whereas == "127.0.0.1" doesn't
+$HTTP["remoteip"] =~ "127.0.0.1" {
 	alias.url += (
 		"/doc/" => "/usr/share/doc/",
 		"/images/" => "/usr/share/images/"