Author: glen Date: Tue Jul 11 18:27:46 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- created
---- Files affected:
SOURCES:
lighttpd-branch.diff (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u /dev/null SOURCES/lighttpd-branch.diff:1.1
--- /dev/null Tue Jul 11 20:27:46 2006
+++ SOURCES/lighttpd-branch.diff Tue Jul 11 20:27:41 2006
@@ -0,0 +1,50052 @@
+
+Property changes on: debian/menu.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/control
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/emacsen-remove.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/watch.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/manpage.1.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/manpage.xml.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/compat
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/manpage.sgml.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/init.d
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/emacsen-startup.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/changelog
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/docs
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/README.Debian.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/emacsen-install.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/rules
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/cron.d.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/postrm.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/preinst.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/prerm.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/dirs
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/lighttpd.postinst
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/lighttpd.conf
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/lighttpd.doc-base.EX
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/copyright
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/conffiles
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/Makefile.am
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/lighttpd-default.ex
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/.cvsignore
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: debian/lighttpd.logrotate
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: AUTHORS
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+Index: configure.in
+===================================================================
+--- configure.in (.../tags/lighttpd-1.4.11) (revision 1159)
++++ configure.in (.../branches/lighttpd-merge-1.4.x) (revision 1159)
+@@ -1,7 +1,7 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.57)
+-AC_INIT(lighttpd, 1.4.11, [EMAIL PROTECTED])
++AC_INIT(lighttpd, 1.4.12, [EMAIL PROTECTED])
+ AC_CONFIG_SRCDIR([src/server.c])
+
+ AC_CANONICAL_TARGET
+@@ -66,7 +66,7 @@
+ AC_TYPE_PID_T
+ AC_TYPE_SIZE_T
+
+-AC_CHECK_MEMBER(struct
tm.tm_gmtoff,AC_DEFINE([HAVE_STRUCT_TM_GMTOFF],[1],[gmtoff in struct
tm]),,[#include <time.h>])
++AC_CHECK_MEMBER(struct
tm.tm_gmtoff,[AC_DEFINE([HAVE_STRUCT_TM_GMTOFF],[1],[gmtoff in struct
tm])],,[#include <time.h>])
+ AC_CHECK_TYPES(struct sockaddr_storage,,,[#include <sys/socket.h>])
+ AC_CHECK_TYPES(socklen_t,,,[#include <sys/types.h>
+ #include <sys/socket.h>])
+@@ -339,6 +339,22 @@
+ AC_DEFINE([HAVE_SQLITE3], [1], [libsqlite3])
+ AC_DEFINE([HAVE_SQLITE3_H], [1], [sqlite3.h])
+ ])
++
++ AC_MSG_CHECKING(for locks in mod_webdav)
++ AC_ARG_WITH(webdav-locks, AC_HELP_STRING([--with-webdav-locks],[locks in
mod_webdav]),
++ [WITH_WEBDAV_LOCKS=$withval],[WITH_WEBDAV_LOCKS=no])
++ AC_MSG_RESULT([$WITH_WEBDAV_LOCKS])
++
++ if test "$WITH_WEBDAV_LOCKS" != "no"; then
++ AC_CHECK_LIB(uuid, uuid_unparse, [
++ AC_CHECK_HEADERS([uuid/uuid.h],[
++ UUID_LIB=-luuid
++ AC_DEFINE([HAVE_UUID], [1], [libuuid])
++ AC_DEFINE([HAVE_UUID_H], [1], [uuid/uuid.h is available])
++ ])
++ ])
++
++ fi
+ fi
+
+ dnl Check for gdbm
+@@ -381,31 +397,12 @@
+
+ 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)
+ fi
+@@ -440,7 +437,7 @@
+ esac
+
+ AC_CHECK_FUNCS([dup2 getcwd inet_ntoa inet_ntop memset mmap munmap strchr \
+- strdup strerror strstr strtol sendfile getopt socket \
++ strdup strerror strstr strtol sendfile getopt socket lstat \
+ 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 @@
+ AC_OUTPUT
+
+
+-do_build="mod_cgi mod_fastcgi mod_proxy mod_evhost mod_simple_vhost
mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog
mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting
mod_indexfiles mod_userdir mod_webdav mod_staticfile mod_scgi"
++do_build="mod_cgi mod_fastcgi mod_proxy mod_evhost mod_simple_vhost
mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog
mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting
mod_indexfiles mod_userdir mod_webdav mod_staticfile mod_scgi
mod_flv_streaming"
+
+ plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+ features="regex-conditionals"
+@@ -642,6 +639,14 @@
+ disable_feature="$disable_feature $features"
+ fi
+
++features="webdav-locks"
++if test "x$UUID_LIB" \!= x; then
++ enable_feature="$enable_feature $features"
++else
++ disable_feature="$disable_feature $features"
++fi
++
++
+ ## output
+
+ $ECHO
+
+Property changes on: configure.in
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+
+Property changes on: ChangeLog
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+Index: src/data_config.c
+===================================================================
+--- src/data_config.c (.../tags/lighttpd-1.4.11) (revision 1159)
++++ src/data_config.c (.../branches/lighttpd-merge-1.4.x) (revision 1159)
+@@ -17,26 +17,26 @@
+
+ static void data_config_free(data_unset *d) {
+ data_config *ds = (data_config *)d;
+-
++
+ buffer_free(ds->key);
+ buffer_free(ds->op);
+ buffer_free(ds->comp_key);
+-
++
+ array_free(ds->value);
+ array_free(ds->childs);
+-
++
+ if (ds->string) buffer_free(ds->string);
+ #ifdef HAVE_PCRE_H
+ if (ds->regex) pcre_free(ds->regex);
+ if (ds->regex_study) pcre_free(ds->regex_study);
+ #endif
+-
++
+ free(d);
+ }
+
+ static void data_config_reset(data_unset *d) {
+ data_config *ds = (data_config *)d;
+-
++
+ /* reused array elements */
+ buffer_reset(ds->key);
+ buffer_reset(ds->comp_key);
+@@ -45,9 +45,9 @@
+
+ static int data_config_insert_dup(data_unset *dst, data_unset *src) {
+ UNUSED(dst);
+-
++
+ src->free(src);
+-
++
+ return 0;
+ }
+
+@@ -56,7 +56,7 @@
+ array *a = (array *)ds->value;
+ size_t i;
+ size_t maxlen;
+-
++
+ if (0 == ds->context_ndx) {
+ fprintf(stderr, "config {\n");
+ }
+@@ -117,22 +117,22 @@
+
+ data_config *data_config_init(void) {
+ data_config *ds;
+-
++
+ ds = calloc(1, sizeof(*ds));
+-
++
+ ds->key = buffer_init();
+ ds->op = buffer_init();
+ ds->comp_key = buffer_init();
+ ds->value = array_init();
+ ds->childs = array_init();
+ ds->childs->is_weakref = 1;
+-
++
+ ds->copy = data_config_copy;
+ ds->free = data_config_free;
+ ds->reset = data_config_reset;
+ ds->insert_dup = data_config_insert_dup;
+ ds->print = data_config_print;
+ ds->type = TYPE_CONFIG;
+-
++
+ return ds;
+ }
+
+Property changes on: src/data_config.c
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+
+Index: src/configfile-glue.c
+===================================================================
+--- src/configfile-glue.c (.../tags/lighttpd-1.4.11) (revision 1159)
++++ src/configfile-glue.c (.../branches/lighttpd-merge-1.4.x)
(revision 1159)
+@@ -1,4 +1,5 @@
+ #include <string.h>
++#include <ctype.h>
+
+ #include "base.h"
+ #include "buffer.h"
+@@ -11,10 +12,10 @@
+ * are the external interface of lighttpd. The functions
+ * are used by the server itself and the plugins.
+ *
+- * The main-goal is to have a small library in the end
+- * which is linked against both and which will define
++ * The main-goal is to have a small library in the end
++ * which is linked against both and which will define
+ * the interface itself in the end.
+- *
++ *
+ */
+
+
+@@ -24,56 +25,60 @@
+ int config_insert_values_internal(server *srv, array *ca, const
config_values_t cv[]) {
+ size_t i;
+ data_unset *du;
+-
++
+ for (i = 0; cv[i].key; i++) {
+-
++
+ if (NULL == (du = array_get_element(ca, cv[i].key))) {
+ /* no found */
+-
++
+ continue;
+ }
+-
++
+ switch (cv[i].type) {
+ case T_CONFIG_ARRAY:
+ if (du->type == TYPE_ARRAY) {
+ size_t j;
+ data_array *da = (data_array *)du;
+-
++
+ for (j = 0; j < da->value->used; j++) {
+ if (da->value->data[j]->type ==
TYPE_STRING) {
+ data_string *ds =
data_string_init();
+-
++
+
buffer_copy_string_buffer(ds->value, ((data_string
*)(da->value->data[j]))->value);
+ if (!da->is_index_key) {
+ /* the id's were
generated automaticly, as we copy now we might have to renumber them
+- * this is used to
prepend server.modules by mod_indexfiles as it has to be loaded
++ * this is used to
prepend server.modules by mod_indexfiles as it has to be loaded
+ * before mod_fastcgi
and friends */
+
buffer_copy_string_buffer(ds->key, ((data_string *)(da->value->data[j]))->key);
+ }
+-
++
+
array_insert_unique(cv[i].destination, (data_unset *)ds);
+ } else {
+- log_error_write(srv, __FILE__,
__LINE__, "sssd",
+- "the key of and
array can only be a string or a integer, variable:",
+- cv[i].key,
"type:", da->value->data[j]->type);
+-
++ log_error_write(srv, __FILE__,
__LINE__, "sssd",
++ "the key of and
array can only be a string or a integer, variable:",
++ cv[i].key,
"type:", da->value->data[j]->type);
++
+ return -1;
+ }
+ }
+ } else {
+ log_error_write(srv, __FILE__, __LINE__, "sss",
"unexpected type for key: ", cv[i].key, "array of strings");
+-
++
+ return -1;
+ }
+ break;
+ case T_CONFIG_STRING:
+ if (du->type == TYPE_STRING) {
+ data_string *ds = (data_string *)du;
+-
++
+ buffer_copy_string_buffer(cv[i].destination,
ds->value);
++ } else if (du->type == TYPE_INTEGER) {
++ data_integer *di = (data_integer *)du;
++
++ buffer_copy_long(cv[i].destination, di->value);
+ } else {
+ log_error_write(srv, __FILE__, __LINE__,
"ssss", "unexpected type for key: ", cv[i].key, "(string)", "\"...\"");
+-
++
+ return -1;
+ }
+ break;
+@@ -81,15 +86,20 @@
+ switch(du->type) {
+ case TYPE_INTEGER: {
+ data_integer *di = (data_integer *)du;
+-
++
+ *((unsigned short *)(cv[i].destination)) =
di->value;
+ break;
+ }
+ case TYPE_STRING: {
+ data_string *ds = (data_string *)du;
+-
++
++ if (buffer_isdigit(ds->value)) {
++ *((unsigned short
*)(cv[i].destination)) = strtol(ds->value->ptr, NULL, 10);
++ break;
++ }
++
+ log_error_write(srv, __FILE__, __LINE__, "ssb",
"get a string but expected a short:", cv[i].key, ds->value);
+-
++
+ return -1;
+ }
+ default:
+@@ -100,19 +110,19 @@
+ case T_CONFIG_BOOLEAN:
+ if (du->type == TYPE_STRING) {
+ data_string *ds = (data_string *)du;
+-
++
+ if (buffer_is_equal_string(ds->value,
CONST_STR_LEN("enable"))) {
+ *((unsigned short
*)(cv[i].destination)) = 1;
+ } else if (buffer_is_equal_string(ds->value,
CONST_STR_LEN("disable"))) {
+ *((unsigned short
*)(cv[i].destination)) = 0;
+ } else {
+ log_error_write(srv, __FILE__,
__LINE__, "ssbs", "ERROR: unexpected value for key:", cv[i].key, ds->value,
"(enable|disable)");
+-
++
+ return -1;
+ }
+ } else {
+ log_error_write(srv, __FILE__, __LINE__,
"ssss", "ERROR: unexpected type for key:", cv[i].key, "(string)",
"\"(enable|disable)\"");
+-
++
+ return -1;
+ }
+ break;
+@@ -121,9 +131,9 @@
+ break;
+ case T_CONFIG_DEPRECATED:
+ log_error_write(srv, __FILE__, __LINE__, "ssss",
"ERROR: found deprecated key:", cv[i].key, "-", (char *)(cv[i].destination));
+-
++
+ srv->config_deprecated = 1;
+-
++
+ break;
+ }
+ }
+@@ -133,25 +143,25 @@
+ int config_insert_values_global(server *srv, array *ca, const config_values_t
cv[]) {
+ size_t i;
+ data_unset *du;
+-
++
+ for (i = 0; cv[i].key; i++) {
+ data_string *touched;
+-
++
+ if (NULL == (du = array_get_element(ca, cv[i].key))) {
+ /* no found */
+-
++
+ continue;
+ }
+-
++
+ /* touched */
+ touched = data_string_init();
+-
++
+ buffer_copy_string(touched->value, "");
+ buffer_copy_string_buffer(touched->key, du->key);
+-
++
+ array_insert_unique(srv->config_touched, (data_unset *)touched);
+ }
+-
++
+ return config_insert_values_internal(srv, ca, cv);
+ }
+
+@@ -191,25 +201,25 @@
+ }
+
+ /* pass the rules */
<<Diff was trimmed, longer than 597 lines>>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
