- up to 1.4.25

Changed files:
    branch.sh -> 1.19
    lighttpd-branch.diff -> 1.64

diff --git a/branch.sh b/branch.sh
index 7d486cc9e38f6615dc9f6fe91e6e85fc0b5b4fa4..2fe3c6754cab8ec92692932ed9a971f74010a2d3 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.24
+tag=lighttpd-1.4.25
 branch=lighttpd-1.4.x
 out=lighttpd-branch.diff
 

diff --git a/lighttpd-branch.diff b/lighttpd-branch.diff
index 299da62874a72920676c0b0e7303d0d64ab78909..bb35da4f4e80653c4e4d00c88a2ddf0bae731d68 100644 (file)
--- a/lighttpd-branch.diff
+++ b/lighttpd-branch.diff
@@ -1,4 +1,4 @@
-# Revision 2692
+# Revision 2695
 Index: src/base.h
 ===================================================================
 --- src/base.h (.../tags/lighttpd-1.4.24)
@@ -623,18 +623,34 @@ Index: src/mod_magnet.c
        assert(lua_gettop(L) == 2);
 Index: configure.ac
 ===================================================================
+Index: doc/Makefile.am
+===================================================================
+--- doc/Makefile.am    (.../tags/lighttpd-1.4.24)
++++ doc/Makefile.am    (.../branches/lighttpd-1.4.x)
+@@ -89,7 +89,7 @@
+       rst2html $^ > $@
+ 
+ 
+-html: $(HTMLDOCS)
++html-local: $(HTMLDOCS)
+ 
+ #%.ps.gz: %.ps
+ #     gzip $^
 Index: SConstruct
 ===================================================================
 Index: NEWS
 ===================================================================
 --- NEWS       (.../tags/lighttpd-1.4.24)
 +++ NEWS       (.../branches/lighttpd-1.4.x)
-@@ -3,7 +3,18 @@
+@@ -3,7 +3,22 @@
  NEWS
  ====
  
 -- 1.4.24 -
-+- 1.4.25 -
++- 1.4.26 -
++  *
++
++- 1.4.25 - 2009-11-21
 +  * mod_magnet: fix pairs() for normal tables and strings (fixes #1307)
 +  * mod_magnet: add traceback for printing lua errors
 +  * mod_rewrite: fix compile error if compiled without pcre
@@ -644,6 +660,7 @@ Index: NEWS
 +  * export some SSL_CLIENT_* vars for client cert validation (fixes #1288, thx presbrey)
 +  * mod_fastcgi: fix mod_fastcgi packet parsing
 +  * mod_fastcgi: Don't reconnect after connect() succeeded (fixes #2096)
++  * Fix configure.ac to allow autoreconf, also enables make V=0
 +
 +- 1.4.24 - 2009-10-25
    * Add T_CONFIG_INT for bigger integers from the config (needed for #1966)