Author: glen Date: Tue Jul 11 18:37:38 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - not all files in tarball, so branch diff has no use - diff original tarball and checkout instead
---- Files affected: SOURCES: lighttpd-branch.diff (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-branch.diff diff -u SOURCES/lighttpd-branch.diff:1.1 SOURCES/lighttpd-branch.diff:1.2 --- SOURCES/lighttpd-branch.diff:1.1 Tue Jul 11 20:27:41 2006 +++ SOURCES/lighttpd-branch.diff Tue Jul 11 20:37:33 2006 @@ -1,187 +1,31 @@ - -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) +--- lighttpd-1.4.11/NEWS 2006-03-09 19:34:33.000000000 +0200 ++++ lighttpd/NEWS 2006-07-11 21:23:42.928033114 +0300 +@@ -3,6 +3,23 @@ + NEWS + ==== + ++- 1.4.12 - 2006-..-.. ++ ++ * added handling of Content-Range to PUT requests in mod_webdav ++ * added handling of ETag and If-Modified-Since to mod_compress if ++ cache-dir is not set ++ * added experimental LOCK support for mod_webdav ++ * added support for X-Sendfile as addition to X-LIGHTTPD-send-file. ++ This allows compatibility with mod_xsendfile for apache ++ (http://celebnamer.celebworld.ws/stuff/mod_xsendfile/) ++ * fixed handling of If-Modified-Since if Etag is not set ++ * fixed hanging fastcgi connections ++ * fixed stalling SSL POST requests ++ * fixed round-robin load-balancing in mod_proxy ++ * TODO: add fail-over to mod-proxy ++ * TODO: fix CACHE_HIT/MISS in mod_cml ++ * TODO: finish LOCK/UNLOCK in mod_webdav ++ + - 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/configure.in 2006-07-11 21:23:42.880030107 +0300 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. @@ -223,7 +67,7 @@ fi dnl Check for gdbm -@@ -381,31 +397,12 @@ +@@ -381,30 +397,11 @@ AC_MSG_RESULT($WITH_LUA) if test "$WITH_LUA" != "no"; then @@ -232,10 +76,8 @@ - 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]) +- 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],[ @@ -245,19 +87,18 @@ - ]) - ]) - fi -+ ]) - +- - if test x"$LUA_LIBS" = x; then -- # try pkgconfig + # try pkgconfig - PKG_CHECK_MODULES(LUA, lua, [ -- AC_DEFINE([HAVE_LUA], [1], [liblua]) -- AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) -- ]) ++ PKG_CHECK_MODULES(LUA, lua >= 5.1, [ + 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 @@ -291,45697 +132,8359 @@ ## 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 @@ +--- lighttpd-1.4.11/doc/authentication.txt 2006-01-12 20:34:26.000000000 +0200 ++++ lighttpd/doc/authentication.txt 2006-07-11 21:23:42.708019334 +0300 +@@ -7,8 +7,8 @@ + ---------------- + + :Author: Jan Kneschke +-:Date: $Date$ +-:Revision: $Revision$ ++:Date: $Date$ ++:Revision: $Revision$ - 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); - } + :abstract: + The auth module provides ... +--- lighttpd-1.4.11/doc/compress.txt 2005-08-11 01:26:16.000000000 +0300 ++++ lighttpd/doc/compress.txt 2006-07-11 21:23:42.680017580 +0300 +@@ -22,12 +22,38 @@ + =========== - 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 @@ + Output compression reduces the network load and can improve the overall +-throughput of the webserver. ++throughput of the webserver. All major http-clients support compression by ++announcing it in the Accept-Encoding header. This is used to negotiate the ++most suitable compression method. We support deflate, gzip and bzip2. - static int data_config_insert_dup(data_unset *dst, data_unset *src) { - UNUSED(dst); -- +-Only static content is supported up to now. ++deflate (RFC1950, RFC1951) and gzip (RFC1952) depend on zlib while bzip2 ++depends on libbzip2. bzip2 is only supported by lynx and some other console ++text-browsers. + +-The server negotiates automaticly which compression method is used. +-Supported are gzip, deflate, bzip. ++Currently we limit to compression support to static files. + - src->free(src); -- ++Caching ++------- + - return 0; - } - -@@ -56,7 +56,7 @@ - array *a = (array *)ds->value; - size_t i; - size_t maxlen; -- ++mod_compress can stored compressed files on disk to optimized the compression ++on a second request away. As soon as compress.cache-dir is set the files are ++compressed. + - if (0 == ds->context_ndx) { - fprintf(stderr, "config {\n"); - } -@@ -117,22 +117,22 @@ - - data_config *data_config_init(void) { - data_config *ds; -- ++The names of the cache files are made of the filename, the compression method ++and the etag associated to the file. + - ds = calloc(1, sizeof(*ds)); -- ++Cleaning the cache is left to the user. A cron job deleting files older than ++10 days should do fine. + - 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; -- ++Limitations ++----------- + - 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; -- ++The module limits the compression of files to files larger than 128 Byte and ++smaller than 128 MByte. + - 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> ++The lower limit is set as small files tend to become larger by compressing due ++to the compression headers, the upper limit is set to work sensable with ++memory and cpu-time. - #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. -- * -+ * - */ + Options + ======= +@@ -47,14 +73,27 @@ + Default: not set, compress the file for every request + compress.filetype +- mimetypes where might get compressed ++ mimetypes which might get compressed + + e.g.: :: + + compress.filetype = ("text/plain", "text/html") -@@ -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; -- -+ <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/lighttpd-branch.diff?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
