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

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2007-12-20 12:37:50 +0000 (Thu, 20 Dec 2007)
New Revision: 279

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.conf
Log:
Put the /doc/ and /images/ aliases at the end.



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2007-09-11 11:24:16 UTC (rev 278)
+++ lighttpd/trunk/debian/changelog	2007-12-20 12:37:50 UTC (rev 279)
@@ -1,3 +1,10 @@
+lighttpd (1.4.18-2) UNRELEASED; urgency=low
+
+  * Move the aliases on /doc/ and /images/ mandated by policy at the end to
+    circumvent #445459.
+
+ -- Pierre Habouzit <madcoder at debian.org>  Thu, 20 Dec 2007 13:35:57 +0100
+
 lighttpd (1.4.18-1) unstable; urgency=low
 
   * New upstream release, fixes CVE-2007-4727 (closes: #441787)

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2007-09-11 11:24:16 UTC (rev 278)
+++ lighttpd/trunk/debian/lighttpd.conf	2007-12-20 12:37:50 UTC (rev 279)
@@ -127,20 +127,6 @@
 # rrdtool.binary = "/usr/bin/rrdtool"
 # rrdtool.db-name = "/var/www/lighttpd.rrd"
 
-
-#### handle Debian Policy Manual, Section 11.5. urls
-#### and by default allow them only from localhost
-
-$HTTP["remoteip"] == "127.0.0.1" {
-	alias.url += ( 
-		"/doc/" => "/usr/share/doc/",
-		"/images/" => "/usr/share/images/"
-	)
-	$HTTP["url"] =~ "^/doc/|^/images/" {
-		dir-listing.activate = "enable"
-	}
-}
-
 #### variable usage:
 ## variable name without "." is auto prefixed by "var." and becomes "var.bar"
 #bar = 1
@@ -162,3 +148,17 @@
 ## load enabled configuration files, 
 ## read /etc/lighttpd/conf-available/README first
 include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
+
+#### 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" {
+	alias.url += (
+		"/doc/" => "/usr/share/doc/",
+		"/images/" => "/usr/share/images/"
+	)
+	$HTTP["url"] =~ "^/doc/|^/images/" {
+		dir-listing.activate = "enable"
+	}
+}
+