SOURCES: lighttpd-branch.diff - svn 1173
glen
glen at pld-linux.org
Sat Jul 15 21:51:10 CEST 2006
Author: glen Date: Sat Jul 15 19:51:10 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- svn 1173
---- Files affected:
SOURCES:
lighttpd-branch.diff (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u SOURCES/lighttpd-branch.diff:1.4 SOURCES/lighttpd-branch.diff:1.5
--- SOURCES/lighttpd-branch.diff:1.4 Tue Jul 11 21:09:38 2006
+++ SOURCES/lighttpd-branch.diff Sat Jul 15 21:51:05 2006
@@ -1,46 +1,4 @@
---- 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 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -41,7 +41,7 @@
- $(srcdir)/distribute.sh.in $(srcdir)/lighttpd.spec.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
-- missing mkinstalldirs
-+ missing
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
-@@ -49,7 +49,7 @@
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = lighttpd.spec distribute.sh
- SOURCES =
-@@ -126,7 +126,6 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--LUACONFIG = @LUACONFIG@
- LUA_CFLAGS = @LUA_CFLAGS@
- LUA_LIBS = @LUA_LIBS@
- MAINT = @MAINT@
-@@ -169,6 +168,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
---- lighttpd-1.4.11/NEWS 2006-03-09 19:34:33.000000000 +0200
+--- ../lighttpd-1.4.11/NEWS 2006-03-09 19:34:33.000000000 +0200
+++ lighttpd-1.4.12/NEWS 2006-07-11 22:07:54.000000000 +0300
@@ -3,6 +3,23 @@
NEWS
@@ -66,8 +24,8 @@
- 1.4.11 - 2006-03-09
* added ability to specify which ip address spawn-fci listens on
---- lighttpd-1.4.11/configure.in 2006-03-04 16:32:38.000000000 +0200
-+++ lighttpd-1.4.12/configure.in 2006-07-11 22:07:54.000000000 +0300
+--- ../lighttpd-1.4.11/configure.in 2006-03-04 16:32:38.000000000 +0200
++++ lighttpd-1.4.12/configure.in 2006-07-15 22:43:22.000000000 +0300
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
@@ -109,7 +67,41 @@
fi
dnl Check for gdbm
-@@ -440,7 +456,7 @@
+@@ -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 @@
esac
AC_CHECK_FUNCS([dup2 getcwd inet_ntoa inet_ntop memset mmap munmap strchr \
@@ -118,7 +110,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 +554,7 @@
+@@ -538,7 +535,7 @@
AC_OUTPUT
@@ -127,7 +119,7 @@
plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
features="regex-conditionals"
-@@ -642,6 +658,14 @@
+@@ -642,6 +639,14 @@
disable_feature="$disable_feature $features"
fi
@@ -142,40 +134,7 @@
## output
$ECHO
---- 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 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = lighttpd.README
- SOURCES =
-@@ -101,7 +101,6 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--LUACONFIG = @LUACONFIG@
- LUA_CFLAGS = @LUA_CFLAGS@
- LUA_LIBS = @LUA_LIBS@
- MAINT = @MAINT@
-@@ -144,6 +143,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
---- lighttpd-1.4.11/cygwin/lighttpd.README 2006-03-07 14:22:19.000000000 +0200
+--- ../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 22:08:04.000000000 +0300
@@ -1,114 +1,114 @@
-lighttpd
@@ -406,7 +365,7 @@
+Cygwin port maintained by: Jan Kneschke <jan at kneschke.de>
+Please address all questions to the Cygwin mailing list at <cygwin at cygwin.com>
+
---- lighttpd-1.4.11/cygwin/lighttpd.README.in 2005-08-11 01:26:59.000000000 +0300
+--- ../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 22:07:53.000000000 +0300
@@ -1,114 +1,114 @@
-lighttpd
@@ -637,40 +596,7 @@
+Cygwin port maintained by: Jan Kneschke <jan at kneschke.de>
+Please address all questions to the Cygwin mailing list at <cygwin at cygwin.com>
+
---- 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 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -105,7 +105,6 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--LUACONFIG = @LUACONFIG@
- LUA_CFLAGS = @LUA_CFLAGS@
- LUA_LIBS = @LUA_LIBS@
- MAINT = @MAINT@
-@@ -148,6 +147,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
---- lighttpd-1.4.11/doc/authentication.txt 2006-01-12 20:34:26.000000000 +0200
+--- ../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 22:07:54.000000000 +0300
@@ -7,8 +7,8 @@
----------------
@@ -683,7 +609,7 @@
:abstract:
The auth module provides ...
---- lighttpd-1.4.11/doc/compress.txt 2005-08-11 01:26:16.000000000 +0300
+--- ../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 22:07:54.000000000 +0300
@@ -22,12 +22,38 @@
===========
@@ -758,7 +684,7 @@
Compressing Dynamic Content
===========================
---- lighttpd-1.4.11/doc/configuration.txt 2006-03-09 02:10:40.000000000 +0200
+--- ../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 22:07:54.000000000 +0300
@@ -7,8 +7,8 @@
------------
@@ -782,7 +708,7 @@
+debug.log-condition-cache-handling
+ for developers only
+ default: disabled
---- lighttpd-1.4.11/doc/fastcgi.txt 2006-02-16 17:03:52.000000000 +0200
+--- ../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 22:07:54.000000000 +0300
@@ -144,8 +144,8 @@
PHP can extract PATH_INFO from it (default: disabled)
@@ -795,7 +721,7 @@
If bin-path is set:
---- lighttpd-1.4.11/doc/lighttpd.conf 2006-03-04 14:41:12.000000000 +0200
+--- ../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 22:07:54.000000000 +0300
@@ -172,10 +172,11 @@
#dir-listing.activate = "enable"
@@ -813,7 +739,7 @@
### only root can use these options
#
---- lighttpd-1.4.11/doc/performance.txt 2006-02-02 13:01:08.000000000 +0200
+--- ../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 22:07:54.000000000 +0300
@@ -183,6 +183,8 @@
@@ -824,7 +750,7 @@
Platform-Specific Notes
=======================
---- lighttpd-1.4.11/doc/secdownload.txt 2005-12-20 15:58:58.000000000 +0200
+--- ../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 22:07:54.000000000 +0300
@@ -118,7 +118,7 @@
$secret = "verysecret";
@@ -835,7 +761,7 @@
$f = "/secret-file.txt";
# current timestamp
---- lighttpd-1.4.11/lighttpd.spec 2006-03-07 14:22:18.000000000 +0200
+--- ../lighttpd-1.4.11/lighttpd.spec 2006-03-07 14:22:18.000000000 +0200
+++ 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)
@@ -845,40 +771,7 @@
Release: 1
Source: http://jan.kneschke.de/projects/lighttpd/download/lighttpd-%version.tar.gz
Packager: Jan Kneschke <jan at kneschke.de>
---- 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 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = control lighttpd.mk
- SOURCES =
-@@ -101,7 +101,6 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--LUACONFIG = @LUACONFIG@
- LUA_CFLAGS = @LUA_CFLAGS@
- LUA_LIBS = @LUA_LIBS@
- MAINT = @MAINT@
-@@ -144,6 +143,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
---- lighttpd-1.4.11/openwrt/control 2006-03-07 14:22:19.000000000 +0200
+--- ../lighttpd-1.4.11/openwrt/control 2006-03-07 14:22:19.000000000 +0200
+++ lighttpd-1.4.12/openwrt/control 2006-07-11 22:08:05.000000000 +0300
@@ -1,8 +1,8 @@
Package: lighttpd
@@ -891,7 +784,7 @@
Section: net
Priority: optional
Depends:
---- lighttpd-1.4.11/openwrt/lighttpd.mk 2006-03-07 14:22:19.000000000 +0200
+--- ../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 22:08:05.000000000 +0300
@@ -10,7 +10,7 @@
@@ -902,287 +795,85 @@
LIGHTTPD_TARGET=.built
LIGHTTPD_DIR=$(BUILD_DIR)/$(LIGHTTPD)
LIGHTTPD_IPK=$(BUILD_DIR)/$(LIGHTTPD)_mipsel.ipk
---- 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 22:07:52.000000000 +0300
-@@ -82,9 +82,9 @@
+--- ../lighttpd-1.4.11/src/Makefile.am 2006-03-07 14:20:20.000000000 +0200
++++ lighttpd-1.4.12/src/Makefile.am 2006-07-15 22:43:21.000000000 +0300
+@@ -16,18 +16,24 @@
+ 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
- lib_LTLIBRARIES += mod_webdav.la
- mod_webdav_la_SOURCES = mod_webdav.c
--mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS)
-+mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS)
- mod_webdav_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
--mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS)
-+mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIB)
+ configfile.c: configparser.h
+ mod_ssi_expr.c: mod_ssi_exprparser.h
++http_resp.c: http_resp_parser.h
- lib_LTLIBRARIES += mod_cml.la
- mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
---- 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 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.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -16,8 +16,6 @@
-
-
-
--SOURCES = $(liblightcomp_la_SOURCES) $(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) $(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) $(mod_cgi_la_SOURCES) $(mod_cml_la_SOURCES) $(mod_compress_la_SOURCES) $(mod_dirlisting_la_SOURCES) $(mod_evasive_la_SOURCES) $(mod_evhost_la_SOURCES) $(mod_expire_la_SOURCES) $(mod_fastcgi_la_SOURCES) $(mod_flv_streaming_la_SOURCES) $(mod_indexfile_la_SOURCES) $(mod_mysql_vhost_la_SOURCES) $(mod_proxy_la_SOURCES) $(mod_redirect_la_SOURCES) $(mod_rewrite_la_SOURCES) $(mod_rrdtool_la_SOURCES) $(mod_scgi_la_SOURCES) $(mod_secdownload_la_SOURCES) $(mod_setenv_la_SOURCES) $(mod_simple_vhost_la_SOURCES) $(mod_ssi_la_SOURCES) $(mod_staticfile_la_SOURCES) $(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) $(proc_open_SOURCES) $(spawn_fcgi_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,7 +55,7 @@
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -84,7 +82,8 @@
- inet_ntop_cache.c crc32.c connections-glue.c configfile-glue.c \
- http-header-glue.c network_write.c network_linux_sendfile.c \
- network_freebsd_sendfile.c network_writev.c \
-- network_solaris_sendfilev.c network_openssl.c splaytree.c
-+ network_solaris_sendfilev.c network_openssl.c splaytree.c \
-+ http_resp.c http_resp_parser.c
- am__objects_1 = liblightcomp_la-buffer.lo liblightcomp_la-log.lo \
- liblightcomp_la-keyvalue.lo liblightcomp_la-chunk.lo \
- liblightcomp_la-http_chunk.lo liblightcomp_la-stream.lo \
-@@ -111,7 +110,8 @@
- liblightcomp_la-network_writev.lo \
- liblightcomp_la-network_solaris_sendfilev.lo \
- liblightcomp_la-network_openssl.lo \
-- liblightcomp_la-splaytree.lo
-+ liblightcomp_la-splaytree.lo liblightcomp_la-http_resp.lo \
-+ liblightcomp_la-http_resp_parser.lo
- @NO_RDYNAMIC_TRUE at am_liblightcomp_la_OBJECTS = $(am__objects_1)
- liblightcomp_la_OBJECTS = $(am_liblightcomp_la_OBJECTS)
- @NO_RDYNAMIC_TRUE at am_liblightcomp_la_rpath = -rpath $(libdir)
-@@ -193,6 +193,9 @@
- mod_simple_vhost_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
- am_mod_simple_vhost_la_OBJECTS = mod_simple_vhost.lo
- mod_simple_vhost_la_OBJECTS = $(am_mod_simple_vhost_la_OBJECTS)
-+mod_sql_vhost_core_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
-+am_mod_sql_vhost_core_la_OBJECTS = mod_sql_vhost_core.lo
-+mod_sql_vhost_core_la_OBJECTS = $(am_mod_sql_vhost_core_la_OBJECTS)
- mod_ssi_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
- am_mod_ssi_la_OBJECTS = mod_ssi_exprparser.lo mod_ssi_expr.lo \
- mod_ssi.lo
-@@ -236,7 +239,8 @@
- connections-glue.c configfile-glue.c http-header-glue.c \
- network_write.c network_linux_sendfile.c \
- network_freebsd_sendfile.c network_writev.c \
-- network_solaris_sendfilev.c network_openssl.c splaytree.c
-+ network_solaris_sendfilev.c network_openssl.c splaytree.c \
-+ http_resp.c http_resp_parser.c
- am__objects_2 = buffer.$(OBJEXT) log.$(OBJEXT) keyvalue.$(OBJEXT) \
- chunk.$(OBJEXT) http_chunk.$(OBJEXT) stream.$(OBJEXT) \
- fdevent.$(OBJEXT) stat_cache.$(OBJEXT) plugin.$(OBJEXT) \
-@@ -254,7 +258,8 @@
- network_linux_sendfile.$(OBJEXT) \
- network_freebsd_sendfile.$(OBJEXT) network_writev.$(OBJEXT) \
- network_solaris_sendfilev.$(OBJEXT) network_openssl.$(OBJEXT) \
-- splaytree.$(OBJEXT)
-+ splaytree.$(OBJEXT) http_resp.$(OBJEXT) \
-+ http_resp_parser.$(OBJEXT)
- @NO_RDYNAMIC_FALSE at am__objects_3 = $(am__objects_2)
- am__objects_4 = server.$(OBJEXT) response.$(OBJEXT) \
- connections.$(OBJEXT) network.$(OBJEXT) configfile.$(OBJEXT) \
-@@ -282,8 +287,8 @@
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link "$(CCLD)" $(AM_CFLAGS) \
-+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(liblightcomp_la_SOURCES) $(mod_access_la_SOURCES) \
- $(mod_accesslog_la_SOURCES) $(mod_alias_la_SOURCES) \
- $(mod_auth_la_SOURCES) $(mod_cgi_la_SOURCES) \
-@@ -296,11 +301,12 @@
- $(mod_rewrite_la_SOURCES) $(mod_rrdtool_la_SOURCES) \
- $(mod_scgi_la_SOURCES) $(mod_secdownload_la_SOURCES) \
- $(mod_setenv_la_SOURCES) $(mod_simple_vhost_la_SOURCES) \
-- $(mod_ssi_la_SOURCES) $(mod_staticfile_la_SOURCES) \
-- $(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
-- $(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
-- $(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-- $(proc_open_SOURCES) $(spawn_fcgi_SOURCES)
-+ $(mod_sql_vhost_core_la_SOURCES) $(mod_ssi_la_SOURCES) \
-+ $(mod_staticfile_la_SOURCES) $(mod_status_la_SOURCES) \
-+ $(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
-+ $(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
-+ $(lemon_SOURCES) $(lighttpd_SOURCES) $(proc_open_SOURCES) \
-+ $(spawn_fcgi_SOURCES)
- DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
- $(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
- $(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
-@@ -313,7 +319,8 @@
- $(mod_redirect_la_SOURCES) $(mod_rewrite_la_SOURCES) \
- $(mod_rrdtool_la_SOURCES) $(mod_scgi_la_SOURCES) \
- $(mod_secdownload_la_SOURCES) $(mod_setenv_la_SOURCES) \
-- $(mod_simple_vhost_la_SOURCES) $(mod_ssi_la_SOURCES) \
-+ $(mod_simple_vhost_la_SOURCES) \
-+ $(mod_sql_vhost_core_la_SOURCES) $(mod_ssi_la_SOURCES) \
- $(mod_staticfile_la_SOURCES) $(mod_status_la_SOURCES) \
- $(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
- $(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
-@@ -375,7 +382,6 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--LUACONFIG = @LUACONFIG@
- LUA_CFLAGS = @LUA_CFLAGS@
- LUA_LIBS = @LUA_LIBS@
- MAINT = @MAINT@
-@@ -418,6 +424,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -479,7 +486,7 @@
+ common_src=buffer.c log.c \
+ keyvalue.c chunk.c \
+@@ -46,7 +52,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 +88,9 @@
- src = server.c response.c connections.c network.c configfile.c \
- configparser.c request.c proc_open.c $(am__append_2)
-@@ -491,10 +498,11 @@
- #mod_httptls_la_LIBADD = $(common_libadd)
- lib_LTLIBRARIES = $(am__append_1) mod_flv_streaming.la mod_evasive.la \
- mod_webdav.la mod_cml.la mod_trigger_b4_dl.la \
-- mod_mysql_vhost.la mod_cgi.la mod_scgi.la mod_staticfile.la \
-- mod_dirlisting.la mod_indexfile.la mod_setenv.la mod_alias.la \
-- mod_userdir.la mod_rrdtool.la mod_usertrack.la mod_proxy.la \
-- mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
-+ mod_mysql_vhost.la mod_sql_vhost_core.la mod_cgi.la \
-+ mod_scgi.la mod_staticfile.la mod_dirlisting.la \
-+ mod_indexfile.la mod_setenv.la mod_alias.la mod_userdir.la \
-+ mod_rrdtool.la mod_usertrack.la mod_proxy.la mod_ssi.la \
-+ mod_secdownload.la mod_expire.la mod_evhost.la \
- mod_simple_vhost.la mod_fastcgi.la mod_access.la \
- mod_compress.la mod_auth.la mod_rewrite.la mod_redirect.la \
- mod_status.la mod_accesslog.la
-@@ -511,9 +519,9 @@
- mod_evasive_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_evasive_la_LIBADD = $(common_libadd)
+ lib_LTLIBRARIES += mod_webdav.la
mod_webdav_la_SOURCES = mod_webdav.c
-mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS)
+mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS)
mod_webdav_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS)
+mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIB)
+
+ lib_LTLIBRARIES += mod_cml.la
mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
- mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
- mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -525,6 +533,9 @@
- mod_mysql_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+@@ -103,6 +109,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
- mod_cgi_la_LIBADD = $(common_libadd)
-@@ -608,7 +619,8 @@
+@@ -240,7 +251,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 \
-+ sys-files.h sys-process.h sys-strings.h
++ sys-files.h sys-process.h sys-strings.h http_resp_parser.h
- lighttpd_SOURCES = $(src)
- lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(SSL_LIB) $(FAM_LIBS)
-@@ -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)
-+mod_sql_vhost_core.la: $(mod_sql_vhost_core_la_OBJECTS) $(mod_sql_vhost_core_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(mod_sql_vhost_core_la_LDFLAGS) $(mod_sql_vhost_core_la_OBJECTS) $(mod_sql_vhost_core_la_LIBADD) $(LIBS)
- 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 +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@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http_resp.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http_resp_parser.Po at am__quote@
- @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@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/lighttpd-branch.diff?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list