SOURCES: lighttpd-branch.diff - svn 1154 is known to build

glen glen at pld-linux.org
Tue Jul 11 21:09:43 CEST 2006


Author: glen                         Date: Tue Jul 11 19:09:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- svn 1154 is known to build

---- Files affected:
SOURCES:
   lighttpd-branch.diff (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u SOURCES/lighttpd-branch.diff:1.3 SOURCES/lighttpd-branch.diff:1.4
--- SOURCES/lighttpd-branch.diff:1.3	Tue Jul 11 20:53:35 2006
+++ SOURCES/lighttpd-branch.diff	Tue Jul 11 21:09:38 2006
@@ -1,4 +1,3 @@
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/Makefile.in lighttpd-1.4.12/Makefile.in
 --- lighttpd-1.4.11/Makefile.in	2006-03-07 14:21:08.000000000 +0200
 +++ lighttpd-1.4.12/Makefile.in	2006-07-11 21:48:16.000000000 +0300
 @@ -1,4 +1,4 @@
@@ -41,9 +40,8 @@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/NEWS lighttpd-1.4.12/NEWS
 --- lighttpd-1.4.11/NEWS	2006-03-09 19:34:33.000000000 +0200
-+++ lighttpd-1.4.12/NEWS	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/NEWS	2006-07-11 22:07:54.000000000 +0300
 @@ -3,6 +3,23 @@
  NEWS
  ====
@@ -68,9 +66,8 @@
  - 1.4.11 - 2006-03-09
  
    * added ability to specify which ip address spawn-fci listens on 
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/configure.in lighttpd-1.4.12/configure.in
 --- lighttpd-1.4.11/configure.in	2006-03-04 16:32:38.000000000 +0200
-+++ lighttpd-1.4.12/configure.in	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/configure.in	2006-07-11 22:07:54.000000000 +0300
 @@ -1,7 +1,7 @@
  #                                               -*- Autoconf -*-
  # Process this file with autoconf to produce a configure script.
@@ -112,41 +109,7 @@
  fi
  
  dnl Check for gdbm
-@@ -381,30 +397,11 @@
- 
- AC_MSG_RESULT($WITH_LUA)
- if test "$WITH_LUA" != "no"; then
-- AC_PATH_PROG(LUACONFIG, lua-config)
--
-- if test x"$LUACONFIG" != x; then
--   LUA_CFLAGS=`$LUACONFIG --include`
--   LUA_LIBS=`$LUACONFIG --libs --extralibs`
-+ # try pkgconfig
-+ PKG_CHECK_MODULES(LUA, lua >= 5.1, [
-    AC_DEFINE([HAVE_LUA], [1], [liblua])
-    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-- else
--   AC_CHECK_LIB(lua, lua_open, [
--     AC_CHECK_HEADERS([lua.h],[
--       LUA_LIBS="-llua -llualib"
--       AC_DEFINE([HAVE_LUA], [1], [liblua])
--       AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
--     ])
--   ])
-- fi
--
-- if test x"$LUA_LIBS" = x; then
--   # try pkgconfig
--   PKG_CHECK_MODULES(LUA, lua, [
--     AC_DEFINE([HAVE_LUA], [1], [liblua])
--     AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
--   ])
-- fi
-+ ])
- 
-  AC_SUBST(LUA_CFLAGS)
-  AC_SUBST(LUA_LIBS)
-@@ -440,7 +437,7 @@
+@@ -440,7 +456,7 @@
  esac
  
  AC_CHECK_FUNCS([dup2 getcwd inet_ntoa inet_ntop memset mmap munmap strchr \
@@ -155,7 +118,7 @@
  		  gethostbyname poll sigtimedwait epoll_ctl getrlimit chroot \
  		  getuid select signal pathconf madvise posix_fadvise posix_madvise \
  		  writev sigaction sendfile64 send_file kqueue port_create localtime_r])
-@@ -538,7 +535,7 @@
+@@ -538,7 +554,7 @@
  AC_OUTPUT
  
  
@@ -164,7 +127,7 @@
  
  plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
  features="regex-conditionals"
-@@ -642,6 +639,14 @@
+@@ -642,6 +658,14 @@
  	disable_feature="$disable_feature $features"
  fi
  
@@ -179,7 +142,6 @@
  ## output
  
  $ECHO
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/cygwin/Makefile.in lighttpd-1.4.12/cygwin/Makefile.in
 --- lighttpd-1.4.11/cygwin/Makefile.in	2006-03-07 14:20:57.000000000 +0200
 +++ lighttpd-1.4.12/cygwin/Makefile.in	2006-07-11 21:48:12.000000000 +0300
 @@ -1,4 +1,4 @@
@@ -213,9 +175,8 @@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/cygwin/lighttpd.README lighttpd-1.4.12/cygwin/lighttpd.README
 --- lighttpd-1.4.11/cygwin/lighttpd.README	2006-03-07 14:22:19.000000000 +0200
-+++ lighttpd-1.4.12/cygwin/lighttpd.README	2006-07-11 21:49:09.000000000 +0300
++++ lighttpd-1.4.12/cygwin/lighttpd.README	2006-07-11 22:08:04.000000000 +0300
 @@ -1,114 +1,114 @@
 -lighttpd
 -------------------------------------------
@@ -445,9 +406,8 @@
 +Cygwin port maintained by: Jan Kneschke <jan at kneschke.de>
 +Please address all questions to the Cygwin mailing list at <cygwin at cygwin.com>
 +
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/cygwin/lighttpd.README.in lighttpd-1.4.12/cygwin/lighttpd.README.in
 --- lighttpd-1.4.11/cygwin/lighttpd.README.in	2005-08-11 01:26:59.000000000 +0300
-+++ lighttpd-1.4.12/cygwin/lighttpd.README.in	2006-07-11 21:23:40.000000000 +0300
++++ lighttpd-1.4.12/cygwin/lighttpd.README.in	2006-07-11 22:07:53.000000000 +0300
 @@ -1,114 +1,114 @@
 -lighttpd
 -------------------------------------------
@@ -677,7 +637,6 @@
 +Cygwin port maintained by: Jan Kneschke <jan at kneschke.de>
 +Please address all questions to the Cygwin mailing list at <cygwin at cygwin.com>
 +
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/Makefile.in lighttpd-1.4.12/doc/Makefile.in
 --- lighttpd-1.4.11/doc/Makefile.in	2006-03-07 14:20:57.000000000 +0200
 +++ lighttpd-1.4.12/doc/Makefile.in	2006-07-11 21:48:12.000000000 +0300
 @@ -1,4 +1,4 @@
@@ -711,9 +670,8 @@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/authentication.txt lighttpd-1.4.12/doc/authentication.txt
 --- lighttpd-1.4.11/doc/authentication.txt	2006-01-12 20:34:26.000000000 +0200
-+++ lighttpd-1.4.12/doc/authentication.txt	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/authentication.txt	2006-07-11 22:07:54.000000000 +0300
 @@ -7,8 +7,8 @@
  ----------------
  
@@ -725,9 +683,8 @@
  
  :abstract:
    The auth module provides ...
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/compress.txt lighttpd-1.4.12/doc/compress.txt
 --- lighttpd-1.4.11/doc/compress.txt	2005-08-11 01:26:16.000000000 +0300
-+++ lighttpd-1.4.12/doc/compress.txt	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/compress.txt	2006-07-11 22:07:54.000000000 +0300
 @@ -22,12 +22,38 @@
  ===========
  
@@ -801,9 +758,8 @@
  Compressing Dynamic Content
  ===========================
  
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/configuration.txt lighttpd-1.4.12/doc/configuration.txt
 --- lighttpd-1.4.11/doc/configuration.txt	2006-03-09 02:10:40.000000000 +0200
-+++ lighttpd-1.4.12/doc/configuration.txt	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/configuration.txt	2006-07-11 22:07:54.000000000 +0300
 @@ -7,8 +7,8 @@
  ------------
  
@@ -826,9 +782,8 @@
 +debug.log-condition-cache-handling
 +  for developers only
 +  default: disabled 
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/fastcgi.txt lighttpd-1.4.12/doc/fastcgi.txt
 --- lighttpd-1.4.11/doc/fastcgi.txt	2006-02-16 17:03:52.000000000 +0200
-+++ lighttpd-1.4.12/doc/fastcgi.txt	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/fastcgi.txt	2006-07-11 22:07:54.000000000 +0300
 @@ -144,8 +144,8 @@
                  PHP can extract PATH_INFO from it (default: disabled)
    :"disable-time": time to wait before a disabled backend is checked
@@ -840,9 +795,8 @@
  
    If bin-path is set:
  
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/lighttpd.conf lighttpd-1.4.12/doc/lighttpd.conf
 --- lighttpd-1.4.11/doc/lighttpd.conf	2006-03-04 14:41:12.000000000 +0200
-+++ lighttpd-1.4.12/doc/lighttpd.conf	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/lighttpd.conf	2006-07-11 22:07:54.000000000 +0300
 @@ -172,10 +172,11 @@
  #dir-listing.activate       = "enable"
  
@@ -859,9 +813,8 @@
  
  ### only root can use these options
  #
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/performance.txt lighttpd-1.4.12/doc/performance.txt
 --- lighttpd-1.4.11/doc/performance.txt	2006-02-02 13:01:08.000000000 +0200
-+++ lighttpd-1.4.12/doc/performance.txt	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/performance.txt	2006-07-11 22:07:54.000000000 +0300
 @@ -183,6 +183,8 @@
  
    server.stat-cache-engine = "fam"   # either fam, simple or disabled
@@ -871,9 +824,8 @@
  
  Platform-Specific Notes
  =======================
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/doc/secdownload.txt lighttpd-1.4.12/doc/secdownload.txt
 --- lighttpd-1.4.11/doc/secdownload.txt	2005-12-20 15:58:58.000000000 +0200
-+++ lighttpd-1.4.12/doc/secdownload.txt	2006-07-11 21:23:42.000000000 +0300
++++ lighttpd-1.4.12/doc/secdownload.txt	2006-07-11 22:07:54.000000000 +0300
 @@ -118,7 +118,7 @@
    $secret = "verysecret";
    $uri_prefix = "/dl/";
@@ -883,9 +835,8 @@
    $f = "/secret-file.txt";
    
    # current timestamp
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/lighttpd.spec lighttpd-1.4.12/lighttpd.spec
 --- lighttpd-1.4.11/lighttpd.spec	2006-03-07 14:22:18.000000000 +0200
-+++ lighttpd-1.4.12/lighttpd.spec	2006-07-11 21:49:09.000000000 +0300
++++ lighttpd-1.4.12/lighttpd.spec	2006-07-11 22:07:58.000000000 +0300
 @@ -1,6 +1,6 @@
  Summary: A fast webserver with minimal memory-footprint (lighttpd)
  Name: lighttpd
@@ -894,7 +845,6 @@
  Release: 1
  Source: http://jan.kneschke.de/projects/lighttpd/download/lighttpd-%version.tar.gz
  Packager: Jan Kneschke <jan at kneschke.de>
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/openwrt/Makefile.in lighttpd-1.4.12/openwrt/Makefile.in
 --- lighttpd-1.4.11/openwrt/Makefile.in	2006-03-07 14:20:58.000000000 +0200
 +++ lighttpd-1.4.12/openwrt/Makefile.in	2006-07-11 21:48:12.000000000 +0300
 @@ -1,4 +1,4 @@
@@ -928,9 +878,8 @@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/openwrt/control lighttpd-1.4.12/openwrt/control
 --- lighttpd-1.4.11/openwrt/control	2006-03-07 14:22:19.000000000 +0200
-+++ lighttpd-1.4.12/openwrt/control	2006-07-11 21:49:10.000000000 +0300
++++ lighttpd-1.4.12/openwrt/control	2006-07-11 22:08:05.000000000 +0300
 @@ -1,8 +1,8 @@
  Package: lighttpd
 -Version: 1.4.11
@@ -942,9 +891,8 @@
  Section: net
  Priority: optional
  Depends:
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/openwrt/lighttpd.mk lighttpd-1.4.12/openwrt/lighttpd.mk
 --- lighttpd-1.4.11/openwrt/lighttpd.mk	2006-03-07 14:22:19.000000000 +0200
-+++ lighttpd-1.4.12/openwrt/lighttpd.mk	2006-07-11 21:49:10.000000000 +0300
++++ lighttpd-1.4.12/openwrt/lighttpd.mk	2006-07-11 22:08:05.000000000 +0300
 @@ -10,7 +10,7 @@
  
  #  For this example we'll use a fairly simple package that compiles easily
@@ -954,41 +902,9 @@
  LIGHTTPD_TARGET=.built
  LIGHTTPD_DIR=$(BUILD_DIR)/$(LIGHTTPD)
  LIGHTTPD_IPK=$(BUILD_DIR)/$(LIGHTTPD)_mipsel.ipk
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/Makefile.am lighttpd-1.4.12/src/Makefile.am
 --- lighttpd-1.4.11/src/Makefile.am	2006-03-07 14:20:20.000000000 +0200
-+++ lighttpd-1.4.12/src/Makefile.am	2006-07-11 21:23:40.000000000 +0300
-@@ -16,14 +16,19 @@
- else
- configparser.y: lemon
- mod_ssi_exprparser.y: lemon
-+http_resp_parser.y: lemon
- 
- configparser.c configparser.h: configparser.y
- 	rm -f configparser.h
--	$(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c
-+	$(LEMON) -q $(srcdir)/$< $(srcdir)/lempar.c
-+
-+http_resp_parser.c http_resp_parser.h: http_resp_parser.y
-+	rm -f http_resp_parser.h
-+	$(LEMON) -q $(srcdir)/$< $(srcdir)/lempar.c
- 
- mod_ssi_exprparser.c mod_ssi_exprparser.h: mod_ssi_exprparser.y 
- 	rm -f mod_ssi_exprparser.h
--	$(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c
-+	$(LEMON) -q $(srcdir)/$< $(srcdir)/lempar.c
- endif
- 
- configfile.c: configparser.h
-@@ -46,7 +51,7 @@
-       network_write.c network_linux_sendfile.c \
-       network_freebsd_sendfile.c network_writev.c \
-       network_solaris_sendfilev.c network_openssl.c \
--      splaytree.c 
-+      splaytree.c http_resp.c http_resp_parser.c 
-       
- src = server.c response.c connections.c network.c \
-       configfile.c configparser.c request.c proc_open.c
-@@ -82,9 +87,9 @@
++++ lighttpd-1.4.12/src/Makefile.am	2006-07-11 22:07:52.000000000 +0300
+@@ -82,9 +82,9 @@
  
  lib_LTLIBRARIES += mod_webdav.la
  mod_webdav_la_SOURCES = mod_webdav.c
@@ -1000,30 +916,8 @@
  
  lib_LTLIBRARIES += mod_cml.la
  mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
-@@ -103,6 +108,11 @@
- mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
- mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_INCLUDE)
- 
-+lib_LTLIBRARIES += mod_sql_vhost_core.la
-+mod_sql_vhost_core_la_SOURCES = mod_sql_vhost_core.c
-+mod_sql_vhost_core_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-+mod_sql_vhost_core_la_LIBADD = $(common_libadd)
-+
- lib_LTLIBRARIES += mod_cgi.la
- mod_cgi_la_SOURCES = mod_cgi.c 
- mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -240,7 +250,7 @@
-       mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
-       configparser.h mod_ssi_exprparser.h \
-       sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
--      splaytree.h proc_open.h
-+      splaytree.h proc_open.h http_resp.h mod_sql_vhost_core.h
- 
- DEFS= @DEFS@ -DLIBRARY_DIR="\"$(libdir)\""
- 
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/Makefile.in lighttpd-1.4.12/src/Makefile.in
 --- lighttpd-1.4.11/src/Makefile.in	2006-03-07 14:21:02.000000000 +0200
-+++ lighttpd-1.4.12/src/Makefile.in	2006-07-11 21:48:14.000000000 +0300
++++ lighttpd-1.4.12/src/Makefile.in	2006-07-11 22:04:27.000000000 +0300
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1200,16 +1094,17 @@
  mod_cgi_la_SOURCES = mod_cgi.c 
  mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
  mod_cgi_la_LIBADD = $(common_libadd)
-@@ -608,7 +619,7 @@
+@@ -608,7 +619,8 @@
        mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
        configparser.h mod_ssi_exprparser.h \
        sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
 -      splaytree.h proc_open.h
-+      splaytree.h proc_open.h http_resp.h mod_sql_vhost_core.h
++      splaytree.h proc_open.h http_resp.h mod_sql_vhost_core.h \
++	  sys-files.h sys-process.h sys-strings.h
  
  lighttpd_SOURCES = $(src)
  lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(SSL_LIB) $(FAM_LIBS)
-@@ -739,6 +750,8 @@
+@@ -739,6 +751,8 @@
  	$(LINK) -rpath $(libdir) $(mod_setenv_la_LDFLAGS) $(mod_setenv_la_OBJECTS) $(mod_setenv_la_LIBADD) $(LIBS)
  mod_simple_vhost.la: $(mod_simple_vhost_la_OBJECTS) $(mod_simple_vhost_la_DEPENDENCIES) 
  	$(LINK) -rpath $(libdir) $(mod_simple_vhost_la_LDFLAGS) $(mod_simple_vhost_la_OBJECTS) $(mod_simple_vhost_la_LIBADD) $(LIBS)
@@ -1218,7 +1113,7 @@
  mod_ssi.la: $(mod_ssi_la_OBJECTS) $(mod_ssi_la_DEPENDENCIES) 
  	$(LINK) -rpath $(libdir) $(mod_ssi_la_LDFLAGS) $(mod_ssi_la_OBJECTS) $(mod_ssi_la_LIBADD) $(LIBS)
  mod_staticfile.la: $(mod_staticfile_la_OBJECTS) $(mod_staticfile_la_DEPENDENCIES) 
-@@ -863,6 +876,8 @@
+@@ -863,6 +877,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http_auth.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http_auth_digest.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http_chunk.Po at am__quote@
@@ -1227,7 +1122,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/inet_ntop_cache.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/joblist.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyvalue.Po at am__quote@
-@@ -890,6 +905,8 @@
+@@ -890,6 +906,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblightcomp_la-fdevent_solaris_devpoll.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblightcomp_la-http-header-glue.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblightcomp_la-http_chunk.Plo at am__quote@
@@ -1236,7 +1131,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblightcomp_la-inet_ntop_cache.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblightcomp_la-joblist.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblightcomp_la-keyvalue.Plo at am__quote@
-@@ -932,6 +949,7 @@
+@@ -932,6 +950,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_secure_download.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_setenv.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_simple_vhost.Plo at am__quote@
@@ -1244,7 +1139,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_ssi.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_ssi_expr.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_ssi_exprparser.Plo at am__quote@
-@@ -1247,6 +1265,20 @@
+@@ -1247,6 +1266,20 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblightcomp_la_CFLAGS) $(CFLAGS) -c -o liblightcomp_la-splaytree.lo `test -f 'splaytree.c' || echo '$(srcdir)/'`splaytree.c
  
@@ -1265,7 +1160,7 @@
  mod_cml_la-mod_cml.lo: mod_cml.c
  @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mod_cml_la_CFLAGS) $(CFLAGS) -MT mod_cml_la-mod_cml.lo -MD -MP -MF "$(DEPDIR)/mod_cml_la-mod_cml.Tpo" -c -o mod_cml_la-mod_cml.lo `test -f 'mod_cml.c' || echo '$(srcdir)/'`mod_cml.c; \
  @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mod_cml_la-mod_cml.Tpo" "$(DEPDIR)/mod_cml_la-mod_cml.Plo"; else rm -f "$(DEPDIR)/mod_cml_la-mod_cml.Tpo"; exit 1; fi
-@@ -1506,14 +1538,19 @@
+@@ -1506,14 +1539,19 @@
  @CROSS_COMPILING_TRUE at mod_ssi_exprparser.c mod_ssi_exprparser.h: 
  @CROSS_COMPILING_FALSE at configparser.y: lemon
  @CROSS_COMPILING_FALSE at mod_ssi_exprparser.y: lemon
@@ -1287,9 +1182,8 @@
  
  configfile.c: configparser.h
  mod_ssi_expr.c: mod_ssi_exprparser.h
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/array.c lighttpd-1.4.12/src/array.c
 --- lighttpd-1.4.11/src/array.c	2005-11-18 13:58:32.000000000 +0200
-+++ lighttpd-1.4.12/src/array.c	2006-07-11 21:23:39.000000000 +0300
++++ lighttpd-1.4.12/src/array.c	2006-07-11 22:07:51.000000000 +0300
 @@ -11,12 +11,12 @@
  
  array *array_init(void) {
@@ -1578,9 +1472,8 @@
  	return 0;
  }
  #endif
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/array.h lighttpd-1.4.12/src/array.h
 --- lighttpd-1.4.11/src/array.h	2005-09-23 21:24:18.000000000 +0300
-+++ lighttpd-1.4.12/src/array.h	2006-07-11 21:23:39.000000000 +0300
++++ lighttpd-1.4.12/src/array.h	2006-07-11 22:07:51.000000000 +0300
 @@ -16,7 +16,7 @@
  #define DATA_UNSET \
  	data_type_t type; \
@@ -1698,9 +1591,8 @@
  	int usage; /* fair-balancing needs the no. of connections active on this host */
  	int last_used_ndx; /* round robin */
  } data_fastcgi;
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/base.h lighttpd-1.4.12/src/base.h
 --- lighttpd-1.4.11/src/base.h	2006-01-11 16:51:04.000000000 +0200
-+++ lighttpd-1.4.12/src/base.h	2006-07-11 21:23:39.000000000 +0300
++++ lighttpd-1.4.12/src/base.h	2006-07-11 22:07:51.000000000 +0300
 @@ -2,7 +2,6 @@
  #define _BASE_H_
  
@@ -1737,7 +1629,7 @@
  /* solaris and NetBSD 1.3.x again */
  #if (!defined(HAVE_STDINT_H)) && (!defined(HAVE_INTTYPES_H)) && (!defined(uint32_t))
 -# define uint32_t u_int32_t
-+/* # define uint32_t u_int32_t */
++//# define uint32_t u_int32_t
 +typedef unsigned __int32 uint32_t;
  #endif
  
@@ -2292,9 +2184,8 @@
  } server;
  
  
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/buffer.c lighttpd-1.4.12/src/buffer.c
 --- lighttpd-1.4.11/src/buffer.c	2006-01-13 00:00:45.000000000 +0200
-+++ lighttpd-1.4.12/src/buffer.c	2006-07-11 21:23:40.000000000 +0300
++++ lighttpd-1.4.12/src/buffer.c	2006-07-11 22:07:52.000000000 +0300
 @@ -12,20 +12,20 @@
  
  
@@ -3042,9 +2933,8 @@
 +
  	return 0;
  }
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/buffer.h lighttpd-1.4.12/src/buffer.h
 --- lighttpd-1.4.11/src/buffer.h	2006-01-13 00:00:45.000000000 +0200
-+++ lighttpd-1.4.12/src/buffer.h	2006-07-11 21:23:40.000000000 +0300
++++ lighttpd-1.4.12/src/buffer.h	2006-07-11 22:07:52.000000000 +0300
 @@ -12,27 +12,44 @@
  
  typedef struct {
@@ -3144,9 +3034,8 @@
  #define SEGFAULT() do { fprintf(stderr, "%s.%d: aborted\n", __FILE__, __LINE__); abort(); } while(0)
  #define UNUSED(x) ( (void)(x) )
  
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/chunk.c lighttpd-1.4.12/src/chunk.c
 --- lighttpd-1.4.11/src/chunk.c	2005-11-18 15:18:19.000000000 +0200
-+++ lighttpd-1.4.12/src/chunk.c	2006-07-11 21:23:39.000000000 +0300
++++ lighttpd-1.4.12/src/chunk.c	2006-07-11 22:07:51.000000000 +0300
 @@ -1,16 +1,14 @@
  /**
   * the network chunk-API
@@ -3520,9 +3409,8 @@
  			break;
  		}
  
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/chunk.h lighttpd-1.4.12/src/chunk.h
 --- lighttpd-1.4.11/src/chunk.h	2005-11-01 09:32:21.000000000 +0200
-+++ lighttpd-1.4.12/src/chunk.h	2006-07-11 21:23:40.000000000 +0300
++++ lighttpd-1.4.12/src/chunk.h	2006-07-11 22:07:51.000000000 +0300
 @@ -6,7 +6,7 @@
  
  typedef struct chunk {
@@ -3569,9 +3457,8 @@
  	chunk *unused;
  	size_t unused_chunks;
  
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/configfile-glue.c lighttpd-1.4.12/src/configfile-glue.c
 --- lighttpd-1.4.11/src/configfile-glue.c	2006-03-03 20:14:56.000000000 +0200
-+++ lighttpd-1.4.12/src/configfile-glue.c	2006-07-11 21:23:39.000000000 +0300
++++ lighttpd-1.4.12/src/configfile-glue.c	2006-07-11 22:07:51.000000000 +0300
 @@ -1,4 +1,5 @@
  #include <string.h>
 +#include <ctype.h>
@@ -4057,9 +3944,8 @@
 +#endif
 +}
 +
-diff -ur -x '*.m4' -x compile -x 'config.*' -x configure -x depcomp -N -x missing -x 'ltmain*' -x install-sh -x mkinstalldirs lighttpd-1.4.11/src/configfile.c lighttpd-1.4.12/src/configfile.c
 --- lighttpd-1.4.11/src/configfile.c	2006-02-15 14:26:42.000000000 +0200
-+++ lighttpd-1.4.12/src/configfile.c	2006-07-11 21:23:39.000000000 +0300
++++ lighttpd-1.4.12/src/configfile.c	2006-07-11 22:07:51.000000000 +0300
 @@ -2,7 +2,6 @@
  
  #include <stdlib.h>
@@ -4068,7 +3954,7 @@
  #include <errno.h>
  #include <string.h>
  #include <stdio.h>
-@@ -13,21 +12,24 @@
+@@ -13,21 +12,23 @@
  #include "log.h"
  #include "stream.h"
  #include "plugin.h"
@@ -4081,7 +3967,6 @@
  #include "proc_open.h"
  
 +#include "sys-files.h"
-+#include "sys-process.h"
 +
 +#ifndef PATH_MAX
 +/* win32 */
@@ -4099,7 +3984,7 @@
  		{ "server.bind",                 NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 0 */
  		{ "server.errorlog",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 1 */
  		{ "server.errorfile-prefix",     NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 2 */
-@@ -38,7 +40,7 @@
+@@ -38,7 +39,7 @@
  		{ "server.tag",                  NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },  /* 7 */
  		{ "server.use-ipv6",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 8 */
  		{ "server.modules",              NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_SERVER },       /* 9 */
@@ -4108,7 +3993,7 @@
  		{ "server.event-handler",        NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 10 */
  		{ "server.pid-file",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 11 */
  		{ "server.max-request-size",     NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 12 */
-@@ -49,7 +51,7 @@
+@@ -49,7 +50,7 @@
  		{ "server.max-keep-alive-requests", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 17 */
  		{ "server.name",                 NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },  /* 18 */
  		{ "server.max-keep-alive-idle",  NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 19 */
@@ -4117,7 +4002,7 @@
  		{ "server.max-read-idle",        NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 20 */
  		{ "server.max-write-idle",       NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },   /* 21 */
  		{ "server.error-handler-404",    NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },  /* 22 */
-@@ -60,19 +62,19 @@
+@@ -60,19 +61,19 @@
  		{ "mimetype.use-xattr",          NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 27 */
  		{ "mimetype.assign",             NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },   /* 28 */
  		{ "ssl.pemfile",                 NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 29 */
@@ -4141,7 +4026,7 @@
  		{ "server.errorlog-use-syslog",  NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER },     /* 39 */
  		{ "server.range-requests",       NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 40 */
  		{ "server.stat-cache-engine",    NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },  /* 41 */
-@@ -80,7 +82,8 @@
+@@ -80,7 +81,8 @@
  		{ "server.network-backend",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },  /* 43 */
  		{ "server.upload-dirs",          NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },   /* 44 */
  		{ "server.core-files",           NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 45 */
@@ -4151,7 +4036,7 @@
  		{ "server.host",                 "use server.bind instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
  		{ "server.docroot",              "use server.document-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
  		{ "server.virtual-root",         "load mod_simple_vhost and use simple-vhost.server-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
-@@ -90,11 +93,11 @@
+@@ -90,11 +92,11 @@
  		{ "server.groupid",              "use server.groupname instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
  		{ "server.use-keep-alive",       "use server.max-keep-alive-requests = 0 instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
  		{ "server.force-lower-case-files",       "use server.force-lowercase-filenames instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
@@ -4165,7 +4050,7 @@
  	/* 0 */
  	cv[0].destination = srv->srvconf.bindhost;
  	cv[1].destination = srv->srvconf.errorlog_file;
-@@ -102,33 +105,33 @@
+@@ -102,33 +104,33 @@
  	cv[4].destination = srv->srvconf.username;
  	cv[5].destination = srv->srvconf.groupname;
  	cv[6].destination = &(srv->srvconf.port);
@@ -4206,7 +4091,7 @@
  		s = calloc(1, sizeof(specific_config));
  		assert(s);
  		s->document_root = buffer_init();
-@@ -154,17 +157,18 @@
+@@ -154,17 +156,18 @@
  		s->global_kbytes_per_second = 0;
  		s->global_bytes_per_second_cnt = 0;
  		s->global_bytes_per_second_cnt_ptr = &s->global_bytes_per_second_cnt;
@@ -4229,7 +4114,7 @@
  		cv[17].destination = &(s->max_keep_alive_requests);
  		cv[18].destination = s->server_name;
  		cv[19].destination = &(s->max_keep_alive_idle);
-@@ -179,23 +183,23 @@
+@@ -179,23 +182,23 @@
  		cv[28].destination = s->mimetypes;
  		cv[29].destination = s->ssl_pemfile;
  		cv[30].destination = &(s->is_ssl);
@@ -4258,7 +4143,7 @@
  	if (buffer_is_empty(stat_cache_string)) {
  		srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_SIMPLE;
  	} else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("simple"))) {
-@@ -205,22 +209,22 @@
+@@ -205,22 +208,22 @@
  	} else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("disable"))) {
  		srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_NONE;
  	} else {
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lighttpd-branch.diff?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list