- do not load internally loaded modules twice, fixes mod_expires module; rel 5

Changed files:
    lighttpd-mod_dirlisting.conf -> 1.6
    lighttpd-mod_indexfile.conf -> 1.7
    lighttpd-mod_staticfile.conf -> 1.13
    lighttpd.spec -> 1.299

diff --git a/lighttpd-mod_dirlisting.conf b/lighttpd-mod_dirlisting.conf
index e3cedd0fdc74c15cfd500247d7550faf7994029e..958b629af82e16b74c5e00f3bc532838da72b38b 100644 (file)
--- a/lighttpd-mod_dirlisting.conf
+++ b/lighttpd-mod_dirlisting.conf
@@ -2,9 +2,7 @@
 #
 # Documentation: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModDirlisting
 
-server.modules += (
-       "mod_dirlisting"
-)
+# NOTE: this module is automatically loaded
 
 #dir-listing.encoding        = "utf-8"
 #server.dir-listing          = "enable"

diff --git a/lighttpd-mod_indexfile.conf b/lighttpd-mod_indexfile.conf
index 8c8deeb61cd653f66351a8060b211fb7294b2428..8edc49d75e75c67ef19ad33d0f7ae8ed38673925 100644 (file)
--- a/lighttpd-mod_indexfile.conf
+++ b/lighttpd-mod_indexfile.conf
@@ -2,9 +2,7 @@
 #
 # Documentation: http://redmine.lighttpd.net/projects/lighttpd/wiki/Index-file-names.Details
 
-server.modules += (
-       "mod_indexfile"
-)
+# NOTE: this module is automatically loaded
 
 # files to check for if .../ is requested
 index-file.names = (

diff --git a/lighttpd-mod_staticfile.conf b/lighttpd-mod_staticfile.conf
index fb2c999917274d86493c1918fab1dba15abc9886..1e020a07803001f739b70a12a678aa4512a59830 100644 (file)
--- a/lighttpd-mod_staticfile.conf
+++ b/lighttpd-mod_staticfile.conf
@@ -1,9 +1,7 @@
 # staticfile module.
 #
 
-server.modules += (
-       "mod_staticfile"
-)
+# NOTE: this module is automatically loaded
 
 # see http://redmine.lighttpd.net/issues/1209
 #etag.use-inode = "enable"

diff --git a/lighttpd.spec b/lighttpd.spec
index 69be7cf1dfa7709d7e095e9bb331af9d26da12cf..2b9aad9d311c9dab49b5d0bc8bb4d3d8622ad344 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -23,7 +23,7 @@ Summary:      Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Version:       1.4.23
-Release:       4
+Release:       5
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2