-Index: cmake/LighttpdMacros.cmake
+Index: ChangeLog
===================================================================
---- cmake/LighttpdMacros.cmake (.../tags/lighttpd-1.4.20) (revision 0)
-+++ cmake/LighttpdMacros.cmake (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -0,0 +1,43 @@
-+## our modules are without the "lib" prefix
-+
-+MACRO(ADD_AND_INSTALL_LIBRARY LIBNAME SRCFILES)
-+ IF(BUILD_STATIC)
-+ ADD_LIBRARY(${LIBNAME} STATIC ${SRCFILES})
-+ TARGET_LINK_LIBRARIES(lighttpd ${LIBNAME})
-+ ELSE(BUILD_STATIC)
-+ ADD_LIBRARY(${LIBNAME} SHARED ${SRCFILES})
-+ SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} ${LIBNAME})
-+ ## Windows likes to link it this way back to app!
-+ IF(WIN32)
-+ SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES LINK_FLAGS lighttpd.lib)
-+ ENDIF(WIN32)
-+
-+ IF(APPLE)
-+ SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
-+ ENDIF(APPLE)
-+ ENDIF(BUILD_STATIC)
-+ENDMACRO(ADD_AND_INSTALL_LIBRARY)
-+
-+MACRO(LEMON_PARSER SRCFILE)
-+ GET_FILENAME_COMPONENT(SRCBASE ${SRCFILE} NAME_WE)
-+ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SRCBASE}.c ${CMAKE_CURRENT_BINARY_DIR}/${SRCBASE}.h
-+ COMMAND ${CMAKE_BINARY_DIR}/build/lemon
-+ ARGS -q ${CMAKE_CURRENT_SOURCE_DIR}/${SRCFILE} ${CMAKE_SOURCE_DIR}/src/lempar.c
-+ DEPENDS ${CMAKE_BINARY_DIR}/build/lemon ${CMAKE_CURRENT_SOURCE_DIR}/${SRCFILE} ${CMAKE_SOURCE_DIR}/src/lempar.c
-+ COMMENT "Generating ${SRCBASE}.c from ${SRCFILE}"
-+)
-+ENDMACRO(LEMON_PARSER)
-+
-+MACRO(ADD_TARGET_PROPERTIES _target _name)
-+ SET(_properties)
-+ FOREACH(_prop ${ARGN})
-+ SET(_properties "${_properties} ${_prop}")
-+ ENDFOREACH(_prop)
-+ GET_TARGET_PROPERTY(_old_properties ${_target} ${_name})
-+ MESSAGE("adding property to ${_target} ${_name}:" ${_properties})
-+ IF(NOT _old_properties)
-+ # in case it's NOTFOUND
-+ SET(_old_properties)
-+ ENDIF(NOT _old_properties)
-+ SET_TARGET_PROPERTIES(${_target} PROPERTIES ${_name} "${_old_properties} ${_properties}")
-+ENDMACRO(ADD_TARGET_PROPERTIES)
-Index: configure.in
+Index: .cvsignore
+===================================================================
+Index: src/.cvsignore
===================================================================
Index: src/configfile-glue.c
===================================================================
---- src/configfile-glue.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/configfile-glue.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -1,4 +1,5 @@
- #include <string.h>
-+#include <stdlib.h>
-
- #include "base.h"
- #include "buffer.h"
-@@ -90,6 +91,22 @@
- case TYPE_STRING: {
- data_string *ds = (data_string *)du;
+--- src/configfile-glue.c (.../tags/lighttpd-1.4.23)
++++ src/configfile-glue.c (.../branches/lighttpd-1.4.x)
+@@ -103,7 +103,6 @@
+ if (e != ds->value->ptr && !*e && l >=0 && l <= 65535) {
+ *((unsigned short *)(cv[i].destination)) = l;
+ break;
+-
+ }
+ }
-+ /* If the value came from an environment variable, then it is a
-+ * data_string, although it may contain a number in ASCII
-+ * decimal format. We try to interpret the string as a decimal
-+ * short before giving up, in order to support setting numeric
-+ * values with environment variables (eg, port number).
-+ */
+@@ -112,10 +111,40 @@
+ return -1;
+ }
+ default:
+- log_error_write(srv, __FILE__, __LINE__, "ssds", "unexpected type for key:", cv[i].key, du->type, "expected a integer, range 0 ... 65535");
++ log_error_write(srv, __FILE__, __LINE__, "ssds", "unexpected type for key:", cv[i].key, du->type, "expected a short integer, range 0 ... 65535");
+ return -1;
+ }
+ break;
++ case T_CONFIG_INT:
++ switch(du->type) {
++ case TYPE_INTEGER: {
++ data_integer *di = (data_integer *)du;
++
++ *((unsigned int *)(cv[i].destination)) = di->value;
++ break;
++ }
++ case TYPE_STRING: {
++ data_string *ds = (data_string *)du;
++
+ if (ds->value->ptr && *ds->value->ptr) {
+ char *e;
+ long l = strtol(ds->value->ptr, &e, 10);
-+ if (e != ds->value->ptr && !*e && l >=0 && l <= 65535) {
-+ *((unsigned short *)(cv[i].destination)) = l;
++ if (e != ds->value->ptr && !*e && l >= 0) {
++ *((unsigned int *)(cv[i].destination)) = l;
+ break;
-+
+ }
+ }
+
- log_error_write(srv, __FILE__, __LINE__, "ssb", "got a string but expected a short:", cv[i].key, ds->value);
-
- return -1;
-@@ -396,6 +413,15 @@
-
- break;
- }
-+ case COMP_HTTP_LANGUAGE: {
-+ data_string *ds;
-+ if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Accept-Language"))) {
-+ l = ds->value;
-+ } else {
-+ l = srv->empty_string;
-+ }
-+ break;
-+ }
- default:
- return COND_RESULT_FALSE;
- }
++
++ log_error_write(srv, __FILE__, __LINE__, "ssb", "got a string but expected an integer:", cv[i].key, ds->value);
++
++ return -1;
++ }
++ default:
++ log_error_write(srv, __FILE__, __LINE__, "ssds", "unexpected type for key:", cv[i].key, du->type, "expected an integer, range 0 ... 4294967295");
++ return -1;
++ }
++ break;
+ case T_CONFIG_BOOLEAN:
+ if (du->type == TYPE_STRING) {
+ data_string *ds = (data_string *)du;
Index: src/mod_cgi.c
===================================================================
---- src/mod_cgi.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_cgi.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -822,15 +822,27 @@
- );
- cgi_env_add(&env, CONST_STR_LEN("SERVER_PORT"), buf, strlen(buf));
-
-+ switch (srv_sock->addr.plain.sa_family) {
- #ifdef HAVE_IPV6
-- s = inet_ntop(srv_sock->addr.plain.sa_family,
-- srv_sock->addr.plain.sa_family == AF_INET6 ?
-- (const void *) &(srv_sock->addr.ipv6.sin6_addr) :
-- (const void *) &(srv_sock->addr.ipv4.sin_addr),
-- b2, sizeof(b2)-1);
-+ case AF_INET6:
-+ s = inet_ntop(srv_sock->addr.plain.sa_family,
-+ (const void *) &(srv_sock->addr.ipv6.sin6_addr),
-+ b2, sizeof(b2)-1);
-+ break;
-+ case AF_INET:
-+ s = inet_ntop(srv_sock->addr.plain.sa_family,
-+ (const void *) &(srv_sock->addr.ipv4.sin_addr),
-+ b2, sizeof(b2)-1);
-+ break;
- #else
-- s = inet_ntoa(srv_sock->addr.ipv4.sin_addr);
-+ case AF_INET:
-+ s = inet_ntoa(srv_sock->addr.ipv4.sin_addr);
-+ break;
+--- src/mod_cgi.c (.../tags/lighttpd-1.4.23)
++++ src/mod_cgi.c (.../branches/lighttpd-1.4.x)
+@@ -56,6 +56,7 @@
+
+ typedef struct {
+ array *cgi;
++ unsigned short execute_x_only;
+ } plugin_config;
+
+ typedef struct {
+@@ -151,6 +152,7 @@
+
+ config_values_t cv[] = {
+ { "cgi.assign", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
++ { "cgi.execute-x-only", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
+ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET}
+ };
+
+@@ -165,8 +167,10 @@
+ assert(s);
+
+ s->cgi = array_init();
++ s->execute_x_only = 0;
+
+ cv[0].destination = s->cgi;
++ cv[1].destination = &(s->execute_x_only);
+
+ p->config_storage[i] = s;
+
+@@ -580,12 +584,9 @@
+ #if 0
+ log_error_write(srv, __FILE__, __LINE__, "sd", "(debug) cgi exited fine, pid:", pid);
#endif
-+ default:
-+ s = "";
-+ break;
-+ }
- cgi_env_add(&env, CONST_STR_LEN("SERVER_ADDR"), s, strlen(s));
+- pid = 0;
+-
+ return HANDLER_GO_ON;
+ } else {
+ log_error_write(srv, __FILE__, __LINE__, "sd", "cgi died, pid:", pid);
+- pid = 0;
+ return HANDLER_GO_ON;
+ }
+ }
+@@ -1005,7 +1006,7 @@
+ args[i++] = cgi_handler->ptr;
+ }
+ args[i++] = con->physical.path->ptr;
+- args[i++] = NULL;
++ args[i ] = NULL;
+
+ /* search for the last / */
+ if (NULL != (c = strrchr(con->physical.path->ptr, '/'))) {
+@@ -1018,8 +1019,6 @@
+ *c = '/';
+ }
- s = get_http_method_name(con->request.http_method);
-@@ -848,15 +860,27 @@
+- openDevNull(STDERR_FILENO);
+-
+ /* we don't need the client socket */
+ for (i = 3; i < 256; i++) {
+ if (i != srv->errorlog_fd) close(i);
+@@ -1198,6 +1197,8 @@
+
+ if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.assign"))) {
+ PATCH(cgi);
++ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.execute-x-only"))) {
++ PATCH(execute_x_only);
+ }
}
+ }
+@@ -1220,6 +1221,7 @@
+ if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path, &sce)) return HANDLER_GO_ON;
+ if (!S_ISREG(sce->st.st_mode)) return HANDLER_GO_ON;
++ if (p->conf.execute_x_only == 1 && (sce->st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0) return HANDLER_GO_ON;
-+ switch (con->dst_addr.plain.sa_family) {
- #ifdef HAVE_IPV6
-- s = inet_ntop(con->dst_addr.plain.sa_family,
-- con->dst_addr.plain.sa_family == AF_INET6 ?
-- (const void *) &(con->dst_addr.ipv6.sin6_addr) :
-- (const void *) &(con->dst_addr.ipv4.sin_addr),
-- b2, sizeof(b2)-1);
-+ case AF_INET6:
-+ s = inet_ntop(con->dst_addr.plain.sa_family,
-+ (const void *) &(con->dst_addr.ipv6.sin6_addr),
-+ b2, sizeof(b2)-1);
-+ break;
-+ case AF_INET:
-+ s = inet_ntop(con->dst_addr.plain.sa_family,
-+ (const void *) &(con->dst_addr.ipv4.sin_addr),
-+ b2, sizeof(b2)-1);
-+ break;
+ s_len = fn->used - 1;
+
+Index: src/network_write.c
+===================================================================
+--- src/network_write.c (.../tags/lighttpd-1.4.23)
++++ src/network_write.c (.../branches/lighttpd-1.4.x)
+@@ -46,15 +46,27 @@
+ toSend = c->mem->used - 1 - c->offset;
+ #ifdef __WIN32
+ if ((r = send(fd, offset, toSend, 0)) < 0) {
+- log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed: ", strerror(errno), fd);
++ /* no error handling for windows... */
++ log_error_write(srv, __FILE__, __LINE__, "ssd", "send failed: ", strerror(errno), fd);
+
+ return -1;
+ }
#else
-- s = inet_ntoa(con->dst_addr.ipv4.sin_addr);
-+ case AF_INET:
-+ s = inet_ntoa(con->dst_addr.ipv4.sin_addr);
-+ break;
+ if ((r = write(fd, offset, toSend)) < 0) {
+- log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed: ", strerror(errno), fd);
++ switch (errno) {
++ case EAGAIN:
++ case EINTR:
++ r = 0;
++ break;
++ case EPIPE:
++ case ECONNRESET:
++ return -2;
++ default:
++ log_error_write(srv, __FILE__, __LINE__, "ssd",
++ "write failed:", strerror(errno), fd);
+
+- return -1;
++ return -1;
++ }
+ }
#endif
-+ default:
-+ s = "";
-+ break;
-+ }
- cgi_env_add(&env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s));
- LI_ltostr(buf,
-Index: src/base.h
-===================================================================
---- src/base.h (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/base.h (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -260,6 +260,7 @@
- unsigned short log_response_header;
- unsigned short log_condition_handling;
- unsigned short log_ssl_noise;
-+ unsigned short log_timeouts;
+@@ -98,7 +110,7 @@
+ return -1;
+ }
+-#if defined USE_MMAP
++#ifdef USE_MMAP
+ if (MAP_FAILED == (p = mmap(0, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "mmap failed: ", strerror(errno));
+
+@@ -109,13 +121,26 @@
+ close(ifd);
+
+ if ((r = write(fd, p + offset, toSend)) <= 0) {
+- log_error_write(srv, __FILE__, __LINE__, "ss", "write failed: ", strerror(errno));
+- munmap(p, sce->st.st_size);
+- return -1;
++ switch (errno) {
++ case EAGAIN:
++ case EINTR:
++ r = 0;
++ break;
++ case EPIPE:
++ case ECONNRESET:
++ munmap(p, sce->st.st_size);
++ return -2;
++ default:
++ log_error_write(srv, __FILE__, __LINE__, "ssd",
++ "write failed:", strerror(errno), fd);
++ munmap(p, sce->st.st_size);
++
++ return -1;
++ }
+ }
- /* server wide */
-@@ -497,6 +498,7 @@
- #endif
- } stat_cache_engine;
- unsigned short enable_cores;
-+ unsigned short reject_expect_100_with_417;
- } server_config;
+ munmap(p, sce->st.st_size);
+-#else
++#else /* USE_MMAP */
+ buffer_prepare_copy(srv->tmp_buf, toSend);
+
+ lseek(ifd, offset, SEEK_SET);
+@@ -127,12 +152,33 @@
+ }
+ close(ifd);
+
+- if (-1 == (r = send(fd, srv->tmp_buf->ptr, toSend, 0))) {
+- log_error_write(srv, __FILE__, __LINE__, "ss", "write: ", strerror(errno));
++#ifdef __WIN32
++ if ((r = send(fd, srv->tmp_buf->ptr, toSend, 0)) < 0) {
++ /* no error handling for windows... */
++ log_error_write(srv, __FILE__, __LINE__, "ssd", "send failed: ", strerror(errno), fd);
+
+ return -1;
+ }
+-#endif
++#else /* __WIN32 */
++ if ((r = write(fd, srv->tmp_buf->ptr, toSend)) < 0) {
++ switch (errno) {
++ case EAGAIN:
++ case EINTR:
++ r = 0;
++ break;
++ case EPIPE:
++ case ECONNRESET:
++ return -2;
++ default:
++ log_error_write(srv, __FILE__, __LINE__, "ssd",
++ "write failed:", strerror(errno), fd);
++
++ return -1;
++ }
++ }
++#endif /* __WIN32 */
++#endif /* USE_MMAP */
++
+ c->offset += r;
+ cq->bytes_out += r;
+
+Index: src/mod_secure_download.c
+===================================================================
+--- src/mod_secure_download.c (.../tags/lighttpd-1.4.23)
++++ src/mod_secure_download.c (.../branches/lighttpd-1.4.x)
+@@ -37,7 +37,7 @@
+ buffer *secret;
+ buffer *uri_prefix;
+
+- unsigned short timeout;
++ unsigned int timeout;
+ } plugin_config;
typedef struct {
+@@ -99,7 +99,7 @@
+ { "secdownload.secret", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
+ { "secdownload.document-root", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
+ { "secdownload.uri-prefix", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 2 */
+- { "secdownload.timeout", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 3 */
++ { "secdownload.timeout", NULL, T_CONFIG_INT, T_CONFIG_SCOPE_CONNECTION }, /* 3 */
+ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
+ };
+
+@@ -245,8 +245,8 @@
+ }
+
+ /* timed-out */
+- if ( (srv->cur_ts > ts && srv->cur_ts - ts > p->conf.timeout) ||
+- (srv->cur_ts < ts && ts - srv->cur_ts > p->conf.timeout) ) {
++ if ( (srv->cur_ts > ts && (unsigned int) (srv->cur_ts - ts) > p->conf.timeout) ||
++ (srv->cur_ts < ts && (unsigned int) (ts - srv->cur_ts) > p->conf.timeout) ) {
+ /* "Gone" as the url will never be valid again instead of "408 - Timeout" where the request may be repeated */
+ con->http_status = 410;
+
+Index: src/base.h
+===================================================================
+--- src/base.h (.../tags/lighttpd-1.4.23)
++++ src/base.h (.../branches/lighttpd-1.4.x)
+@@ -84,6 +84,7 @@
+ typedef enum { T_CONFIG_UNSET,
+ T_CONFIG_STRING,
+ T_CONFIG_SHORT,
++ T_CONFIG_INT,
+ T_CONFIG_BOOLEAN,
+ T_CONFIG_ARRAY,
+ T_CONFIG_LOCAL,
+@@ -281,7 +282,7 @@
+ unsigned short etag_use_mtime;
+ unsigned short etag_use_size;
+ unsigned short force_lowercase_filenames; /* if the FS is case-insensitive, force all files to lower-case */
+- unsigned short max_request_size;
++ unsigned int max_request_size;
+
+ unsigned short kbytes_per_second; /* connection kb/s limit */
+
+@@ -472,6 +473,7 @@
+
+ buffer *errorlog_file;
+ unsigned short errorlog_use_syslog;
++ buffer *breakagelog_file;
+
+ unsigned short dont_daemonize;
+ buffer *changeroot;
+@@ -490,7 +492,7 @@
+ unsigned short max_worker;
+ unsigned short max_fds;
+ unsigned short max_conns;
+- unsigned short max_request_size;
++ unsigned int max_request_size;
+
+ unsigned short log_request_header_on_error;
+ unsigned short log_state_handling;
+@@ -538,7 +540,7 @@
+
+ /* the errorlog */
+ int errorlog_fd;
+- enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
++ enum { ERRORLOG_FILE, ERRORLOG_FD, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
+ buffer *errorlog_buf;
+
+ fdevents *ev, *ev_ins;
Index: src/mod_rewrite.c
===================================================================
---- src/mod_rewrite.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_rewrite.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -350,11 +350,7 @@
+--- src/mod_rewrite.c (.../tags/lighttpd-1.4.23)
++++ src/mod_rewrite.c (.../branches/lighttpd-1.4.x)
+@@ -176,7 +176,7 @@
+ data_unset *du;
+
+ if (NULL != (du = array_get_element(ca, option))) {
+- data_array *da = (data_array *)du;
++ data_array *da;
+ size_t j;
+
+ if (du->type != TYPE_ARRAY) {
+@@ -373,7 +373,7 @@
+ }
+ } else {
+ const char **list;
+- size_t start, end;
++ size_t start;
+ size_t k;
- if (!p->conf.rewrite) return HANDLER_GO_ON;
+ /* it matched */
+@@ -383,17 +383,15 @@
-- buffer_copy_string_buffer(p->match_buf, con->uri.path);
-- if (con->uri.query->used > 0) {
-- buffer_append_string_len(p->match_buf, CONST_STR_LEN("?"));
-- buffer_append_string_buffer(p->match_buf, con->uri.query);
-- }
-+ buffer_copy_string_buffer(p->match_buf, con->request.uri);
+ buffer_reset(con->request.uri);
+
+- start = 0; end = pattern_len;
++ start = 0;
+ for (k = 0; k < pattern_len; k++) {
+ if (pattern[k] == '$' || pattern[k] == '%') {
+ /* got one */
- for (i = 0; i < p->conf.rewrite->used; i++) {
- pcre *match;
+ size_t num = pattern[k + 1] - '0';
+
+- end = k;
++ buffer_append_string_len(con->request.uri, pattern + start, k - start);
+
+- buffer_append_string_len(con->request.uri, pattern + start, end - start);
+-
+ if (!isdigit((unsigned char)pattern[k + 1])) {
+ /* enable escape: "%%" => "%", "%a" => "%a", "$$" => "$" */
+ buffer_append_string_len(con->request.uri, pattern+k, pattern[k] == pattern[k+1] ? 1 : 2);
Index: src/connections.c
===================================================================
---- src/connections.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/connections.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -330,15 +330,13 @@
- buffer_prepare_copy(b, 4 * 1024);
- len = recv(con->fd, b->ptr, b->size - 1, 0);
- #else
-- if (ioctl(con->fd, FIONREAD, &toread)) {
-- log_error_write(srv, __FILE__, __LINE__, "sd",
-- "unexpected end-of-file:",
-- con->fd);
-- return -1;
-+ if (ioctl(con->fd, FIONREAD, &toread) || toread == 0) {
-+ b = chunkqueue_get_append_buffer(con->read_queue);
-+ buffer_prepare_copy(b, 4 * 1024);
-+ } else {
-+ b = chunkqueue_get_append_buffer(con->read_queue);
-+ buffer_prepare_copy(b, toread + 1);
- }
-- b = chunkqueue_get_append_buffer(con->read_queue);
-- buffer_prepare_copy(b, toread + 1);
--
- len = read(con->fd, b->ptr, b->size - 1);
- #endif
+--- src/connections.c (.../tags/lighttpd-1.4.23)
++++ src/connections.c (.../branches/lighttpd-1.4.x)
+@@ -782,13 +782,13 @@
+ CLEAN(request.pathinfo);
+ CLEAN(request.request);
+
+- CLEAN(request.orig_uri);
++ /* CLEAN(request.orig_uri); */
+
+ CLEAN(uri.scheme);
+- CLEAN(uri.authority);
+- CLEAN(uri.path);
++ /* CLEAN(uri.authority); */
++ /* CLEAN(uri.path); */
+ CLEAN(uri.path_raw);
+- CLEAN(uri.query);
++ /* CLEAN(uri.query); */
+
+ CLEAN(physical.doc_root);
+ CLEAN(physical.path);
+@@ -1401,6 +1401,11 @@
+ "state for fd", con->fd, connection_get_state(con->state));
+ }
-@@ -1066,6 +1064,9 @@
- if (dst_c->file.fd == -1) {
- /* this should not happen as we cache the fd, but you never know */
- dst_c->file.fd = open(dst_c->file.name->ptr, O_WRONLY | O_APPEND);
-+#ifdef FD_CLOEXEC
-+ fcntl(dst_c->file.fd, F_SETFD, FD_CLOEXEC);
-+#endif
- }
- } else {
- /* the chunk is too large now, close it */
-Index: src/array.h
-===================================================================
---- src/array.h (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/array.h (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -87,6 +87,7 @@
- COMP_HTTP_HOST,
- COMP_HTTP_REFERER,
- COMP_HTTP_USER_AGENT,
-+ COMP_HTTP_LANGUAGE,
- COMP_HTTP_COOKIE,
- COMP_HTTP_REMOTE_IP,
- COMP_HTTP_QUERY_STRING,
-Index: src/mod_alias.c
-===================================================================
---- src/mod_alias.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_alias.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -103,9 +103,8 @@
- }
- /* ok, they have same prefix. check position */
- if (a->sorted[j] < a->sorted[k]) {
-- fprintf(stderr, "url.alias: `%s' will never match as `%s' matched first\n",
-- key->ptr,
-- prefix->ptr);
-+ log_error_write(srv, __FILE__, __LINE__, "SBSBS",
-+ "url.alias: `", key, "' will never match as `", prefix, "' matched first");
- return HANDLER_ERROR;
- }
++ buffer_reset(con->uri.authority);
++ buffer_reset(con->uri.path);
++ buffer_reset(con->uri.query);
++ buffer_reset(con->request.orig_uri);
++
+ if (http_request_parse(srv, con)) {
+ /* we have to read some data from the POST request */
+
+@@ -1725,7 +1730,7 @@
+ case HANDLER_FINISHED:
+ break;
+ default:
+- log_error_write(srv, __FILE__, __LINE__, "");
++ log_error_write(srv, __FILE__, __LINE__, "sd", "unhandling return value", r);
+ break;
}
-Index: src/configfile.c
+ break;
+Index: src/network.c
===================================================================
---- src/configfile.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/configfile.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -91,9 +91,11 @@
- { "server.core-files", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 46 */
- { "ssl.cipher-list", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 47 */
- { "ssl.use-sslv2", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 48 */
-- { "etag.use-inode", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */
-- { "etag.use-mtime", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */
-- { "etag.use-size", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 51 */
-+ { "etag.use-inode", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */
-+ { "etag.use-mtime", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */
-+ { "etag.use-size", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 51 */
-+ { "server.reject-expect-100-with-417", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 52 */
-+ { "debug.log-timeouts", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 53 */
- { "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 },
-@@ -135,6 +137,7 @@
+--- src/network.c (.../tags/lighttpd-1.4.23)
++++ src/network.c (.../branches/lighttpd-1.4.x)
+@@ -90,6 +90,7 @@
- cv[43].destination = &(srv->srvconf.max_conns);
- cv[12].destination = &(srv->srvconf.max_request_size);
-+ cv[52].destination = &(srv->srvconf.reject_expect_100_with_417);
- srv->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
+ srv_socket = calloc(1, sizeof(*srv_socket));
+ srv_socket->fd = -1;
++ srv_socket->fde_ndx = -1;
- assert(srv->config_storage);
-@@ -159,7 +162,7 @@
- s->max_write_idle = 360;
- s->use_xattr = 0;
- s->is_ssl = 0;
-- s->ssl_use_sslv2 = 1;
-+ s->ssl_use_sslv2 = 0;
- s->use_ipv6 = 0;
- #ifdef HAVE_LSTAT
- s->follow_symlink = 1;
-@@ -207,6 +210,7 @@
- cv[33].destination = &(s->log_response_header);
- cv[34].destination = &(s->log_request_header);
- cv[35].destination = &(s->log_ssl_noise);
-+ cv[53].destination = &(s->log_timeouts);
-
- cv[36].destination = &(s->allow_http11);
- cv[39].destination = s->ssl_ca_file;
-@@ -374,6 +378,8 @@
- PATCH(log_file_not_found);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-ssl-noise"))) {
- PATCH(log_ssl_noise);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-timeouts"))) {
-+ PATCH(log_timeouts);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.protocol-http11"))) {
- PATCH(allow_http11);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.force-lowercase-filenames"))) {
-@@ -940,7 +946,6 @@
- }
+ srv_socket->srv_token = buffer_init();
+ buffer_copy_string_buffer(srv_socket->srv_token, host_token);
+@@ -103,7 +104,7 @@
+ if (NULL == (sp = strrchr(b->ptr, ':'))) {
+ log_error_write(srv, __FILE__, __LINE__, "sb", "value of $SERVER[\"socket\"] has to be \"ip:port\".", b);
- int config_parse_cmd(server *srv, config_t *context, const char *cmd) {
-- proc_handler_t proc;
- tokenizer_t t;
- int ret;
- buffer *source;
-@@ -960,7 +965,7 @@
- chdir(context->basedir->ptr);
+- return -1;
++ goto error_free_socket;
}
-- if (0 != proc_open_buffer(&proc, cmd, NULL, out, NULL)) {
-+ if (0 != proc_open_buffer(cmd, NULL, out, NULL)) {
- log_error_write(srv, __FILE__, __LINE__, "sbss",
- "opening", source, "failed:", strerror(errno));
- ret = -1;
-Index: src/mod_trigger_b4_dl.c
-===================================================================
---- src/mod_trigger_b4_dl.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_trigger_b4_dl.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -1,5 +1,6 @@
- #include <ctype.h>
- #include <stdlib.h>
-+#include <fcntl.h>
- #include <string.h>
+ host = b->ptr;
+@@ -126,7 +127,7 @@
+ } else if (port == 0 || port > 65535) {
+ log_error_write(srv, __FILE__, __LINE__, "sd", "port out of range:", port);
- #include "base.h"
-@@ -180,6 +181,9 @@
- "gdbm-open failed");
- return HANDLER_ERROR;
- }
-+#ifdef FD_CLOEXEC
-+ fcntl(gdbm_fdesc(s->db), F_SETFD, FD_CLOEXEC);
-+#endif
+- return -1;
++ goto error_free_socket;
+ }
+
+ if (*host == '\0') host = NULL;
+@@ -138,12 +139,12 @@
+
+ if (-1 == (srv_socket->fd = socket(srv_socket->addr.plain.sa_family, SOCK_STREAM, 0))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socket failed:", strerror(errno));
+- return -1;
++ goto error_free_socket;
}
+ #else
+ log_error_write(srv, __FILE__, __LINE__, "s",
+ "ERROR: Unix Domain sockets are not supported.");
+- return -1;
++ goto error_free_socket;
#endif
- #if defined(HAVE_PCRE_H)
-Index: src/mod_mysql_vhost.c
-===================================================================
---- src/mod_mysql_vhost.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_mysql_vhost.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -245,7 +245,6 @@
- if (!(buffer_is_empty(s->myuser) ||
- buffer_is_empty(s->mydb))) {
- my_bool reconnect = 1;
-- int fd;
-
- if (NULL == (s->mysql = mysql_init(NULL))) {
- log_error_write(srv, __FILE__, __LINE__, "s", "mysql_init() failed, exiting...");
-@@ -267,19 +266,27 @@
- return HANDLER_ERROR;
- }
- #undef FOO
-+
-+#if 0
- /* set close_on_exec for mysql the hard way */
- /* Note: this only works as it is done during startup, */
- /* otherwise we cannot be sure that mysql is fd i-1 */
-- if (-1 == (fd = open("/dev/null", 0))) {
-+ { int fd;
-+ if (-1 != (fd = open("/dev/null", 0))) {
- close(fd);
-+#ifdef FD_CLOEXEC
- fcntl(fd-1, F_SETFD, FD_CLOEXEC);
-- }
-+#endif
-+ } }
-+#else
-+#ifdef FD_CLOEXEC
-+ fcntl(s->mysql->net.fd, F_SETFD, FD_CLOEXEC);
-+#endif
-+#endif
- }
}
--
--
-- return HANDLER_GO_ON;
-+ return HANDLER_GO_ON;
- }
-
- #define PATCH(x) \
-Index: src/request.c
-===================================================================
---- src/request.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/request.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -894,11 +894,12 @@
- *
- */
+@@ -153,7 +154,7 @@
-- con->http_status = 417;
-- con->keep_alive = 0;
--
-- array_insert_unique(con->request.headers, (data_unset *)ds);
-- return 0;
-+ if (srv->srvconf.reject_expect_100_with_417 && 0 == buffer_caseless_compare(CONST_BUF_LEN(ds->value), CONST_STR_LEN("100-continue"))) {
-+ con->http_status = 417;
-+ con->keep_alive = 0;
-+ array_insert_unique(con->request.headers, (data_unset *)ds);
-+ return 0;
-+ }
- } else if (cmp > 0 && 0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key), CONST_STR_LEN("Host")))) {
- if (!con->request.http_host) {
- con->request.http_host = ds->value;
-@@ -1020,7 +1021,7 @@
- /* strip leading WS */
- if (value == cur) value = cur+1;
- default:
-- if (*cur >= 0 && *cur < 32) {
-+ if (*cur >= 0 && *cur < 32 && *cur != '\t') {
- if (srv->srvconf.log_request_header_on_error) {
- log_error_write(srv, __FILE__, __LINE__, "sds",
- "invalid char in header", (int)*cur, "-> 400");
-Index: src/inet_ntop_cache.c
-===================================================================
---- src/inet_ntop_cache.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/inet_ntop_cache.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -11,7 +11,7 @@
- #ifdef HAVE_IPV6
- size_t ndx = 0, i;
- for (i = 0; i < INET_NTOP_CACHE_MAX; i++) {
-- if (srv->inet_ntop_cache[i].ts != 0) {
-+ if (srv->inet_ntop_cache[i].ts != 0 && srv->inet_ntop_cache[i].family == addr->plain.sa_family) {
- if (srv->inet_ntop_cache[i].family == AF_INET6 &&
- 0 == memcmp(srv->inet_ntop_cache[i].addr.ipv6.s6_addr, addr->ipv6.sin6_addr.s6_addr, 16)) {
- /* IPv6 found in cache */
-Index: src/mod_rrdtool.c
-===================================================================
---- src/mod_rrdtool.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_rrdtool.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -179,6 +179,11 @@
- p->read_fd = from_rrdtool_fds[0];
- p->rrdtool_pid = pid;
+ if (-1 == (srv_socket->fd = socket(srv_socket->addr.plain.sa_family, SOCK_STREAM, IPPROTO_TCP))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socket failed:", strerror(errno));
+- return -1;
++ goto error_free_socket;
+ }
+ srv_socket->use_ipv6 = 1;
+ }
+@@ -163,17 +164,22 @@
+ srv_socket->addr.plain.sa_family = AF_INET;
+ if (-1 == (srv_socket->fd = socket(srv_socket->addr.plain.sa_family, SOCK_STREAM, IPPROTO_TCP))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socket failed:", strerror(errno));
+- return -1;
++ goto error_free_socket;
+ }
+ }
+#ifdef FD_CLOEXEC
-+ fcntl(p->write_fd, F_SETFD, FD_CLOEXEC);
-+ fcntl(p->read_fd, F_SETFD, FD_CLOEXEC);
++ /* set FD_CLOEXEC now, fdevent_fcntl_set is called later; needed for pipe-logger forks */
++ fcntl(srv_socket->fd, F_SETFD, FD_CLOEXEC);
+#endif
+
- break;
- }
- }
-Index: src/response.c
-===================================================================
---- src/response.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/response.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -44,16 +44,15 @@
- buffer_append_string(b, get_http_status_name(con->http_status));
-
- if (con->request.http_version != HTTP_VERSION_1_1 || con->keep_alive == 0) {
-- buffer_append_string_len(b, CONST_STR_LEN("\r\nConnection: "));
- if (con->keep_alive) {
-- buffer_append_string_len(b, CONST_STR_LEN("keep-alive"));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Connection"), CONST_STR_LEN("keep-alive"));
- } else {
-- buffer_append_string_len(b, CONST_STR_LEN("close"));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Connection"), CONST_STR_LEN("close"));
- }
- }
+ /* */
+ srv->cur_fds = srv_socket->fd;
- if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
-- buffer_append_string_len(b, CONST_STR_LEN("\r\nTransfer-Encoding: chunked"));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Transfer-Encoding"), CONST_STR_LEN("chunked"));
+ val = 1;
+ if (setsockopt(srv_socket->fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
+- return -1;
++ goto error_free_socket;
}
+ switch(srv_socket->addr.plain.sa_family) {
+@@ -198,7 +204,7 @@
+ "sssss", "getaddrinfo failed: ",
+ gai_strerror(r), "'", host, "'");
-@@ -199,6 +198,7 @@
- config_patch_connection(srv, con, COMP_HTTP_REMOTE_IP); /* Client-IP */
- config_patch_connection(srv, con, COMP_HTTP_REFERER); /* Referer: */
- config_patch_connection(srv, con, COMP_HTTP_USER_AGENT);/* User-Agent: */
-+ config_patch_connection(srv, con, COMP_HTTP_LANGUAGE); /* Accept-Language: */
- config_patch_connection(srv, con, COMP_HTTP_COOKIE); /* Cookie: */
- config_patch_connection(srv, con, COMP_HTTP_REQUEST_METHOD); /* REQUEST_METHOD */
+- return -1;
++ goto error_free_socket;
+ }
-@@ -233,6 +233,27 @@
- }
+ memcpy(&(srv_socket->addr), res->ai_addr, res->ai_addrlen);
+@@ -220,17 +226,17 @@
+ log_error_write(srv, __FILE__, __LINE__,
+ "sds", "gethostbyname failed: ",
+ h_errno, host);
+- return -1;
++ goto error_free_socket;
+ }
+ if (he->h_addrtype != AF_INET) {
+ log_error_write(srv, __FILE__, __LINE__, "sd", "addr-type != AF_INET: ", he->h_addrtype);
+- return -1;
++ goto error_free_socket;
+ }
-+ /**
-+ *
-+ * call plugins
-+ *
-+ * - based on the raw URL
-+ *
-+ */
-+
-+ switch(r = plugins_call_handle_uri_raw(srv, con)) {
-+ case HANDLER_GO_ON:
-+ break;
-+ case HANDLER_FINISHED:
-+ case HANDLER_COMEBACK:
-+ case HANDLER_WAIT_FOR_EVENT:
-+ case HANDLER_ERROR:
-+ return r;
-+ default:
-+ log_error_write(srv, __FILE__, __LINE__, "sd", "handle_uri_raw: unknown return value", r);
-+ break;
-+ }
-+
- /* build filename
- *
- * - decode url-encodings (e.g. %20 -> ' ')
-@@ -240,6 +261,7 @@
- */
+ if (he->h_length != sizeof(struct in_addr)) {
+ log_error_write(srv, __FILE__, __LINE__, "sd", "addr-length != sizeof(in_addr): ", he->h_length);
+- return -1;
++ goto error_free_socket;
+ }
+ memcpy(&(srv_socket->addr.ipv4.sin_addr.s_addr), he->h_addr_list[0], he->h_length);
+@@ -260,7 +266,7 @@
+ host);
-+
- if (con->request.http_method == HTTP_METHOD_OPTIONS &&
- con->uri.path_raw->ptr[0] == '*' && con->uri.path_raw->ptr[1] == '\0') {
- /* OPTIONS * ... */
-@@ -255,32 +277,10 @@
- log_error_write(srv, __FILE__, __LINE__, "sb", "URI-path : ", con->uri.path);
+
+- return -1;
++ goto error_free_socket;
}
+ /* connect failed */
+@@ -275,14 +281,12 @@
+ "testing socket failed:",
+ host, strerror(errno));
+
+- return -1;
++ goto error_free_socket;
+ }
+
+ break;
+ default:
+- addr_len = 0;
-
- /**
- *
- * call plugins
- *
-- * - based on the raw URL
-- *
-- */
--
-- switch(r = plugins_call_handle_uri_raw(srv, con)) {
-- case HANDLER_GO_ON:
-- break;
-- case HANDLER_FINISHED:
-- case HANDLER_COMEBACK:
-- case HANDLER_WAIT_FOR_EVENT:
-- case HANDLER_ERROR:
-- return r;
-- default:
-- log_error_write(srv, __FILE__, __LINE__, "sd", "handle_uri_raw: unknown return value", r);
-- break;
-- }
--
-- /**
-- *
-- * call plugins
-- *
- * - based on the clean URL
- *
- */
-Index: src/buffer.c
-===================================================================
---- src/buffer.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/buffer.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -159,7 +159,7 @@
- if (!src) return -1;
+- return -1;
++ goto error_free_socket;
+ }
+
+ if (0 != bind(srv_socket->fd, (struct sockaddr *) &(srv_socket->addr), addr_len)) {
+@@ -298,12 +302,12 @@
+ host, port, strerror(errno));
+ break;
+ }
+- return -1;
++ goto error_free_socket;
+ }
- if (src->used == 0) {
-- b->used = 0;
-+ buffer_reset(b);
- return 0;
+ if (-1 == listen(srv_socket->fd, 128 * 8)) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "listen failed: ", strerror(errno));
+- return -1;
++ goto error_free_socket;
}
- return buffer_copy_string_len(b, src->ptr, src->used - 1);
-@@ -187,6 +187,7 @@
- if (!s || !b) return -1;
-
- s_len = strlen(s);
-+ if (s_len > maxlen) s_len = maxlen;
- buffer_prepare_append(b, maxlen + 1);
- if (b->used == 0)
- b->used++;
-Index: src/mod_simple_vhost.c
-===================================================================
---- src/mod_simple_vhost.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_simple_vhost.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -249,6 +249,8 @@
- return HANDLER_GO_ON;
- } else {
- buffer_copy_string_buffer(con->server_name, p->conf.default_host);
-+ /* do not cache default host */
-+ return HANDLER_GO_ON;
+
+ if (s->is_ssl) {
+@@ -316,14 +320,14 @@
+ if (0 == RAND_status()) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
+ "not enough entropy in the pool");
+- return -1;
++ goto error_free_socket;
}
- } else {
- buffer_copy_string_buffer(con->server_name, con->uri.authority);
-Index: src/mod_proxy.c
-===================================================================
---- src/mod_proxy.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_proxy.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -454,6 +454,7 @@
+ }
- if (ds->value->used && ds->key->used) {
- if (buffer_is_equal_string(ds->key, CONST_STR_LEN("Connection"))) continue;
-+ if (buffer_is_equal_string(ds->key, CONST_STR_LEN("Proxy-Connection"))) continue;
+ if (NULL == (s->ssl_ctx = SSL_CTX_new(SSLv23_server_method()))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
+ ERR_error_string(ERR_get_error(), NULL));
+- return -1;
++ goto error_free_socket;
+ }
- buffer_append_string_buffer(b, ds->key);
- buffer_append_string_len(b, CONST_STR_LEN(": "));
-@@ -652,7 +653,7 @@
- buffer_prepare_append(hctx->response, b + 1);
- hctx->response->used = 1;
- } else {
-- buffer_prepare_append(hctx->response, hctx->response->used + b);
-+ buffer_prepare_append(hctx->response, b);
+ if (!s->ssl_use_sslv2) {
+@@ -331,7 +335,7 @@
+ if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
+ ERR_error_string(ERR_get_error(), NULL));
+- return -1;
++ goto error_free_socket;
+ }
}
- if (-1 == (r = read(hctx->fd, hctx->response->ptr + hctx->response->used - 1, b))) {
-@@ -1198,7 +1199,8 @@
- host = (data_proxy *)extension->value->data[0];
+@@ -340,33 +344,33 @@
+ if (SSL_CTX_set_cipher_list(s->ssl_ctx, s->ssl_cipher_list->ptr) != 1) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
+ ERR_error_string(ERR_get_error(), NULL));
+- return -1;
++ goto error_free_socket;
+ }
+ }
- /* Use last_used_ndx from first host in list */
-- k = ndx = host->last_used_ndx;
-+ k = host->last_used_ndx;
-+ ndx = k + 1; /* use next host after the last one */
- if (ndx < 0) ndx = 0;
+ if (buffer_is_empty(s->ssl_pemfile)) {
+ log_error_write(srv, __FILE__, __LINE__, "s", "ssl.pemfile has to be set");
+- return -1;
++ goto error_free_socket;
+ }
- /* Search first active host after last_used_ndx */
-Index: src/config.h.cmake
-===================================================================
---- src/config.h.cmake (.../tags/lighttpd-1.4.20) (revision 0)
-+++ src/config.h.cmake (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -0,0 +1,157 @@
-+/*
-+ CMake autogenerated config.h file. Do not edit!
-+*/
-+
-+/* Package details */
-+#define LIGHTTPD_VERSION_ID ${LIGHTTPD_VERSION_ID}
-+#define PACKAGE_NAME "${PACKAGE_NAME}"
-+#define PACKAGE_VERSION "${PACKAGE_VERSION}"
-+#define PACKAGE_BUILD_DATE "${PACKAGE_BUILD_DATE}"
-+#define LIBRARY_DIR "${LIGHTTPD_LIBRARY_DIR}"
-+
-+/* System */
-+#cmakedefine HAVE_SYS_DEVPOLL_H
-+#cmakedefine HAVE_SYS_EPOLL_H
-+#cmakedefine HAVE_SYS_EVENT_H
-+#cmakedefine HAVE_SYS_MMAN_H
-+#cmakedefine HAVE_SYS_POLL_H
-+#cmakedefine HAVE_SYS_PORT_H
-+#cmakedefine HAVE_SYS_PRCTL_H
-+#cmakedefine HAVE_SYS_RESOURCE_H
-+#cmakedefine HAVE_SYS_SENDFILE_H
-+#cmakedefine HAVE_SYS_SELECT_H
-+#cmakedefine HAVE_SYS_SYSLIMITS_H
-+#cmakedefine HAVE_SYS_TYPES_H
-+#cmakedefine HAVE_SYS_UIO_H
-+#cmakedefine HAVE_SYS_UN_H
-+#cmakedefine HAVE_SYS_WAIT_H
-+#cmakedefine HAVE_SYS_TIME_H
-+#cmakedefine HAVE_UNISTD_H
-+#cmakedefine HAVE_PTHREAD_H
-+#cmakedefine HAVE_INET_ATON
-+#cmakedefine HAVE_IPV6
+ if (!buffer_is_empty(s->ssl_ca_file)) {
+ if (1 != SSL_CTX_load_verify_locations(s->ssl_ctx, s->ssl_ca_file->ptr, NULL)) {
+ log_error_write(srv, __FILE__, __LINE__, "ssb", "SSL:",
+ ERR_error_string(ERR_get_error(), NULL), s->ssl_ca_file);
+- return -1;
++ goto error_free_socket;
+ }
+ }
+
+ if (SSL_CTX_use_certificate_file(s->ssl_ctx, s->ssl_pemfile->ptr, SSL_FILETYPE_PEM) < 0) {
+ log_error_write(srv, __FILE__, __LINE__, "ssb", "SSL:",
+ ERR_error_string(ERR_get_error(), NULL), s->ssl_pemfile);
+- return -1;
++ goto error_free_socket;
+ }
+
+ if (SSL_CTX_use_PrivateKey_file (s->ssl_ctx, s->ssl_pemfile->ptr, SSL_FILETYPE_PEM) < 0) {
+ log_error_write(srv, __FILE__, __LINE__, "ssb", "SSL:",
+ ERR_error_string(ERR_get_error(), NULL), s->ssl_pemfile);
+- return -1;
++ goto error_free_socket;
+ }
+
+ if (SSL_CTX_check_private_key(s->ssl_ctx) != 1) {
+@@ -374,7 +378,7 @@
+ "Private key does not match the certificate public key, reason:",
+ ERR_error_string(ERR_get_error(), NULL),
+ s->ssl_pemfile);
+- return -1;
++ goto error_free_socket;
+ }
+ SSL_CTX_set_default_read_ahead(s->ssl_ctx, 1);
+ SSL_CTX_set_mode(s->ssl_ctx, SSL_CTX_get_mode(s->ssl_ctx) | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+@@ -390,7 +394,7 @@
+ log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
+ "ssl requested but openssl support is not compiled in");
+
+- return -1;
++ goto error_free_socket;
+ #endif
+ #ifdef TCP_DEFER_ACCEPT
+ } else if (s->defer_accept) {
+@@ -414,7 +418,6 @@
+ }
+
+ srv_socket->is_ssl = s->is_ssl;
+- srv_socket->fde_ndx = -1;
+
+ if (srv->srv_sockets.size == 0) {
+ srv->srv_sockets.size = 4;
+@@ -430,6 +433,21 @@
+ buffer_free(b);
+
+ return 0;
+
-+/* XATTR */
-+#cmakedefine HAVE_ATTR_ATTRIBUTES_H
-+#cmakedefine HAVE_XATTR
++error_free_socket:
++ if (srv_socket->fd != -1) {
++ /* check if server fd are already registered */
++ if (srv_socket->fde_ndx != -1) {
++ fdevent_event_del(srv->ev, &(srv_socket->fde_ndx), srv_socket->fd);
++ fdevent_unregister(srv->ev, srv_socket->fd);
++ }
+
-+/* mySQL */
-+#cmakedefine HAVE_MYSQL_H
-+#cmakedefine HAVE_MYSQL
++ close(srv_socket->fd);
++ }
++ buffer_free(srv_socket->srv_token);
++ free(srv_socket);
+
-+/* OpenSSL */
-+#cmakedefine HAVE_OPENSSL_SSL_H
-+#cmakedefine HAVE_LIBCRYPTO
-+#cmakedefine OPENSSL_NO_KRB5
-+#cmakedefine HAVE_LIBSSL
-+
-+/* BZip */
-+#cmakedefine HAVE_BZLIB_H
-+#cmakedefine HAVE_LIBBZ2
-+
-+/* FAM */
-+#cmakedefine HAVE_FAM_H
-+#cmakedefine HAVE_FAMNOEXISTS
-+
-+/* getopt */
-+#cmakedefine HAVE_GETOPT_H
-+
-+#cmakedefine HAVE_INTTYPES_H
-+
-+/* LDAP */
-+#cmakedefine HAVE_LDAP_H
-+#cmakedefine HAVE_LIBLDAP
-+#cmakedefine HAVE_LBER_H
-+#cmakedefine HAVE_LIBLBER
-+#cmakedefine LDAP_DEPRECATED 1
-+
-+/* XML */
-+#cmakedefine HAVE_LIBXML_H
-+#cmakedefine HAVE_LIBXML
-+
-+/* PCRE */
-+#cmakedefine HAVE_PCRE_H
-+#cmakedefine HAVE_LIBPCRE
-+
-+#cmakedefine HAVE_POLL_H
-+#cmakedefine HAVE_PWD_H
-+
-+/* sqlite3 */
-+#cmakedefine HAVE_SQLITE3_H
-+#cmakedefine HAVE_LIBPCRE
-+
-+#cmakedefine HAVE_STDDEF_H
-+#cmakedefine HAVE_STDINT_H
-+#cmakedefine HAVE_SYSLOG_H
-+
-+/* UUID */
-+#cmakedefine HAVE_UUID_UUID_H
-+#cmakedefine HAVE_LIBUUID
-+
-+/* ZLIB */
-+#cmakedefine HAVE_ZLIB_H
-+#cmakedefine HAVE_LIBZ
-+
-+/* lua */
-+#cmakedefine HAVE_LUA_H
-+#cmakedefine HAVE_LIBLUA
-+
-+/* gdbm */
-+#cmakedefine HAVE_GDBM_H
-+#cmakedefine HAVE_GDBM
-+
-+/* memcache */
-+#cmakedefine HAVE_MEMCACHE_H
-+
-+/* inotify */
-+#cmakedefine HAVE_INOTIFY_INIT
-+#cmakedefine HAVE_SYS_INOTIFY_H
-+
-+/* Types */
-+#cmakedefine HAVE_SOCKLEN_T
-+#cmakedefine SIZEOF_LONG ${SIZEOF_LONG}
-+#cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T}
-+
-+/* Functions */
-+#cmakedefine HAVE_CHROOT
-+#cmakedefine HAVE_CRYPT
-+#cmakedefine HAVE_EPOLL_CTL
-+#cmakedefine HAVE_FORK
-+#cmakedefine HAVE_GETRLIMIT
-+#cmakedefine HAVE_GETUID
-+#cmakedefine HAVE_GMTIME_R
-+#cmakedefine HAVE_INET_NTOP
-+#cmakedefine HAVE_KQUEUE
-+#cmakedefine HAVE_LOCALTIME_R
-+#cmakedefine HAVE_LSTAT
-+#cmakedefine HAVE_MADVISE
-+#cmakedefine HAVE_MEMCPY
-+#cmakedefine HAVE_MEMSET
-+#cmakedefine HAVE_MMAP
-+#cmakedefine HAVE_PATHCONF
-+#cmakedefine HAVE_POLL
-+#cmakedefine HAVE_PORT_CREATE
-+#cmakedefine HAVE_PRCTL
-+#cmakedefine HAVE_PREAD
-+#cmakedefine HAVE_POSIX_FADVISE
-+#cmakedefine HAVE_SELECT
-+#cmakedefine HAVE_SENDFILE
-+#cmakedefine HAVE_SEND_FILE
-+#cmakedefine HAVE_SENDFILE64
-+#cmakedefine HAVE_SENDFILEV
-+#cmakedefine HAVE_SIGACTION
-+#cmakedefine HAVE_SIGNAL
-+#cmakedefine HAVE_SIGTIMEDWAIT
-+#cmakedefine HAVE_STRPTIME
-+#cmakedefine HAVE_SYSLOG
-+#cmakedefine HAVE_WRITEV
-+
-+/* libcrypt */
-+#cmakedefine HAVE_CRYPT_H
-+#cmakedefine HAVE_LIBCRYPT
-+
-+/* fastcgi */
-+#cmakedefine HAVE_FASTCGI_H
-+#cmakedefine HAVE_FASTCGI_FASTCGI_H
++ return -1;
+ }
+
+ int network_close(server *srv) {
+@@ -567,12 +585,8 @@
+ /* not our stage */
+ if (COMP_SERVER_SOCKET != dc->comp) continue;
+
+- if (dc->cond != CONFIG_COND_EQ) {
+- log_error_write(srv, __FILE__, __LINE__, "s", "only == is allowed for $SERVER[\"socket\"].");
++ if (dc->cond != CONFIG_COND_EQ) continue;
+
+- return -1;
+- }
+-
+ /* check if we already know this socket,
+ * if yes, don't init it */
+ for (j = 0; j < srv->srv_sockets.used; j++) {
+Index: src/configfile.c
+===================================================================
+--- src/configfile.c (.../tags/lighttpd-1.4.23)
++++ src/configfile.c (.../branches/lighttpd-1.4.x)
+@@ -42,12 +42,12 @@
+
+ { "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 */
++ { "server.max-request-size", NULL, T_CONFIG_INT, T_CONFIG_SCOPE_CONNECTION }, /* 12 */
+ { "server.max-worker", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_SERVER }, /* 13 */
+ { "server.document-root", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 14 */
+- { "server.force-lowercase-filenames", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 15 */
++ { "server.force-lowercase-filenames", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER },/* 15 */
+ { "debug.log-condition-handling", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 16 */
+- { "server.max-keep-alive-requests", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 17 */
++ { "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 */
+
+@@ -91,12 +91,13 @@
+ { "server.core-files", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 46 */
+ { "ssl.cipher-list", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 47 */
+ { "ssl.use-sslv2", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 48 */
+- { "etag.use-inode", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */
+- { "etag.use-mtime", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */
+- { "etag.use-size", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 51 */
++ { "etag.use-inode", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */
++ { "etag.use-mtime", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */
++ { "etag.use-size", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 51 */
+ { "server.reject-expect-100-with-417", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 52 */
+ { "debug.log-timeouts", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 53 */
+- { "server.defer-accept", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 54 */
++ { "server.defer-accept", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 54 */
++ { "server.breakagelog", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 55 */
+ { "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 },
+@@ -139,6 +140,8 @@
+ cv[43].destination = &(srv->srvconf.max_conns);
+ cv[12].destination = &(srv->srvconf.max_request_size);
+ cv[52].destination = &(srv->srvconf.reject_expect_100_with_417);
++ cv[55].destination = srv->srvconf.breakagelog_file;
+
-+#cmakedefine LIGHTTPD_STATIC
-Index: src/network_freebsd_sendfile.c
-===================================================================
---- src/network_freebsd_sendfile.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/network_freebsd_sendfile.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -167,6 +167,7 @@
- switch(errno) {
- case EAGAIN:
- case EINTR:
-+ r = 0; /* try again later */
- break;
- case ENOTCONN:
- return -2;
-@@ -174,10 +175,7 @@
- log_error_write(srv, __FILE__, __LINE__, "ssd", "sendfile: ", strerror(errno), errno);
- return -1;
+ srv->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
+
+ assert(srv->config_storage);
+@@ -290,6 +293,7 @@
+ PATCH(log_condition_handling);
+ PATCH(log_file_not_found);
+ PATCH(log_ssl_noise);
++ PATCH(log_timeouts);
+
+ PATCH(range_requests);
+ PATCH(force_lowercase_filenames);
+@@ -1135,15 +1139,15 @@
+ * - select works everywhere
+ * - linux-* are experimental
+ */
++#ifdef USE_LINUX_EPOLL
++ { FDEVENT_HANDLER_LINUX_SYSEPOLL, "linux-sysepoll" },
++#endif
+ #ifdef USE_POLL
+ { FDEVENT_HANDLER_POLL, "poll" },
+ #endif
+ #ifdef USE_SELECT
+ { FDEVENT_HANDLER_SELECT, "select" },
+ #endif
+-#ifdef USE_LINUX_EPOLL
+- { FDEVENT_HANDLER_LINUX_SYSEPOLL, "linux-sysepoll" },
+-#endif
+ #ifdef USE_LINUX_SIGIO
+ { FDEVENT_HANDLER_LINUX_RTSIG, "linux-rtsig" },
+ #endif
+Index: src/mod_evhost.c
+===================================================================
+--- src/mod_evhost.c (.../tags/lighttpd-1.4.23)
++++ src/mod_evhost.c (.../branches/lighttpd-1.4.x)
+@@ -213,7 +213,7 @@
+ if (colon != ptr) {
+ ds = data_string_init();
+ buffer_copy_string_len(ds->key,CONST_STR_LEN("%"));
+- buffer_append_long(ds->key, i++);
++ buffer_append_long(ds->key, i /* ++ */);
+ buffer_copy_string_len(ds->value,ptr,colon-ptr);
+
+ array_insert_unique(host,(data_unset *)ds);
+@@ -294,10 +294,10 @@
+ char *colon = strchr(con->uri.authority->ptr, ':');
+
+ if(colon == NULL) {
+- buffer_append_string_buffer(p->tmp_buf, con->uri.authority); // adds fqdn
++ buffer_append_string_buffer(p->tmp_buf, con->uri.authority); /* adds fqdn */
+ } else {
+ /* strip the port out of the authority-part of the URI scheme */
+- buffer_append_string_len(p->tmp_buf, con->uri.authority->ptr, colon - con->uri.authority->ptr); // adds fqdn
++ buffer_append_string_len(p->tmp_buf, con->uri.authority->ptr, colon - con->uri.authority->ptr); /* adds fqdn */
}
-- }
--
-- if (r == 0 && (errno != EAGAIN && errno != EINTR)) {
-- int oerrno = errno;
-+ } else if (r == 0) {
- /* We got an event to write but we wrote nothing
- *
- * - the file shrinked -> error
-@@ -190,12 +188,9 @@
+ } else if (NULL != (ds = (data_string *)array_get_element(parsed_host,p->conf.path_pieces[i]->ptr))) {
+ if (ds->value->used) {
+Index: src/splaytree.c
+===================================================================
+--- src/splaytree.c (.../tags/lighttpd-1.4.23)
++++ src/splaytree.c (.../branches/lighttpd-1.4.x)
+@@ -61,12 +61,11 @@
+ * size fields are maintained */
+ splay_tree * splaytree_splay (splay_tree *t, int i) {
+ splay_tree N, *l, *r, *y;
+- int comp, root_size, l_size, r_size;
++ int comp, l_size, r_size;
+
+ if (t == NULL) return t;
+ N.left = N.right = NULL;
+ l = r = &N;
+- root_size = node_size(t);
+ l_size = r_size = 0;
+
+ for (;;) {
+Index: src/lemon.c
+===================================================================
+--- src/lemon.c (.../tags/lighttpd-1.4.23)
++++ src/lemon.c (.../branches/lighttpd-1.4.x)
+@@ -39,6 +39,12 @@
+ # endif
+ #endif
+
++#if __GNUC__ > 2
++#define NORETURN __attribute__ ((__noreturn__))
++#else
++#define NORETURN
++#endif
++
+ /* #define PRIVATE static */
+ #define PRIVATE static
+
+@@ -51,7 +57,7 @@
+ char *msort();
+ extern void *malloc();
+
+-extern void memory_error();
++extern void memory_error() NORETURN;
+
+ /******** From the file "action.h" *************************************/
+ struct action *Action_new();
+@@ -59,7 +65,7 @@
+ void Action_add();
+
+ /********* From the file "assert.h" ************************************/
+-void myassert();
++void myassert() NORETURN;
+ #ifndef NDEBUG
+ # define assert(X) if(!(X))myassert(__FILE__,__LINE__)
+ #else
+@@ -1333,7 +1339,7 @@
+ /* Report an out-of-memory condition and abort. This function
+ ** is used mostly by the "MemoryCheck" macro in struct.h
+ */
+-void memory_error(){
++void memory_error() {
+ fprintf(stderr,"Out of memory. Aborting...\n");
+ exit(1);
+ }
+@@ -1608,7 +1614,6 @@
+ FILE *err;
+ {
+ int spcnt, i;
+- spcnt = 0;
+ if( argv[0] ) fprintf(err,"%s",argv[0]);
+ spcnt = strlen(argv[0]) + 1;
+ for(i=1; i<n && argv[i]; i++){
+@@ -2336,6 +2341,7 @@
+ if( filebuf==0 ){
+ ErrorMsg(ps.filename,0,"Can't allocate %d of memory to hold this file.",
+ filesize+1);
++ fclose(fp);
+ gp->errorcnt++;
+ return;
+ }
+@@ -2343,6 +2349,7 @@
+ ErrorMsg(ps.filename,0,"Can't read in all %d bytes of this file.",
+ filesize);
+ free(filebuf);
++ fclose(fp);
+ gp->errorcnt++;
+ return;
+ }
+@@ -2913,7 +2920,7 @@
+ }else if( sp->destructor ){
+ cp = sp->destructor;
+ fprintf(out,"#line %d \"%s\"\n{",sp->destructorln,lemp->filename);
+- }else if( lemp->vardest ){
++ }else{
+ cp = lemp->vardest;
+ if( cp==0 ) return;
+ fprintf(out,"#line %d \"%s\"\n{",lemp->vardestln,lemp->filename);
+@@ -3042,7 +3049,7 @@
+ int *plineno; /* Pointer to the line number */
+ int mhflag; /* True if generating makeheaders output */
+ {
+- int lineno = *plineno; /* The line number of the output */
++ int lineno; /* The line number of the output */
+ char **types; /* A hash table of datatypes */
+ int arraysize; /* Size of the "types" array */
+ int maxdtlength; /* Maximum length of any ".datatype" field. */
+Index: src/mod_scgi.c
+===================================================================
+--- src/mod_scgi.c (.../tags/lighttpd-1.4.23)
++++ src/mod_scgi.c (.../branches/lighttpd-1.4.x)
+@@ -331,8 +331,21 @@
+
+ int scgi_proclist_sort_down(server *srv, scgi_extension_host *host, scgi_proc *proc);
+
++static void reset_signals(void) {
++#ifdef SIGTTOU
++ signal(SIGTTOU, SIG_DFL);
++#endif
++#ifdef SIGTTIN
++ signal(SIGTTIN, SIG_DFL);
++#endif
++#ifdef SIGTSTP
++ signal(SIGTSTP, SIG_DFL);
++#endif
++ signal(SIGHUP, SIG_DFL);
++ signal(SIGPIPE, SIG_DFL);
++ signal(SIGUSR1, SIG_DFL);
++}
- if (offset >= sce->st.st_size) {
- /* file shrinked, close the connection */
-- errno = oerrno;
-
- return -1;
- }
+ static handler_ctx * handler_ctx_init() {
+ handler_ctx * hctx;
-- errno = oerrno;
- return -2;
+@@ -772,10 +785,8 @@
+ env.used = 0;
+
+ if (scgi_fd != 0) {
+- close(0);
+ dup2(scgi_fd, 0);
+ close(scgi_fd);
+- scgi_fd = 0;
}
-Index: src/http_auth.c
-===================================================================
---- src/http_auth.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/http_auth.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -57,22 +57,25 @@
-
- static const char base64_pad = '=';
-
-+/* "A-Z a-z 0-9 + /" maps to 0-63 */
- static const short base64_reverse_table[256] = {
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-- -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-+/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 - 0x0F */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 - 0x1F */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 - 0x2F */
-+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 - 0x3F */
-+ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 - 0x4F */
-+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 - 0x5F */
-+ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 - 0x6F */
-+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, /* 0x70 - 0x7F */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x80 - 0x8F */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x90 - 0x9F */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xA0 - 0xAF */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xB0 - 0xBF */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xC0 - 0xCF */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xD0 - 0xDF */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xE0 - 0xEF */
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xF0 - 0xFF */
- };
-
-
-@@ -697,7 +700,7 @@
- }
- } else if (p->conf.auth_backend == AUTH_BACKEND_LDAP) {
- #ifdef USE_LDAP
-- LDAP *ldap = NULL;
-+ LDAP *ldap;
- LDAPMessage *lm, *first;
- char *dn;
- int ret;
-@@ -742,56 +745,45 @@
- buffer_append_string_buffer(p->ldap_filter, username);
- buffer_append_string_buffer(p->ldap_filter, p->conf.ldap_filter_post);
+ /* we don't need the client socket */
+@@ -783,8 +794,6 @@
+ close(fd);
+ }
+- openDevNull(STDERR_FILENO);
+-
+ /* build clean environment */
+ if (host->bin_env_copy->used) {
+ for (i = 0; i < host->bin_env_copy->used; i++) {
+@@ -828,6 +837,8 @@
+ buffer_copy_string_len(b, CONST_STR_LEN("exec "));
+ buffer_append_string_buffer(b, host->bin_path);
+
++ reset_signals();
+
- /* 2. */
-- if (p->conf.ldap == NULL ||
-- LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
-- /* try again if ldap was only temporary down */
-- if (p->conf.ldap == NULL || ret != LDAP_SERVER_DOWN || LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
-- if (auth_ldap_init(srv, &p->conf) != HANDLER_GO_ON)
-+ if (p->anon_conf->ldap == NULL ||
-+ LDAP_SUCCESS != (ret = ldap_search_s(p->anon_conf->ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
-+
-+ /* try again; the ldap library sometimes fails for the first call but reconnects */
-+ if (p->anon_conf->ldap == NULL || ret != LDAP_SERVER_DOWN ||
-+ LDAP_SUCCESS != (ret = ldap_search_s(p->anon_conf->ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
-+
-+ if (auth_ldap_init(srv, p->anon_conf) != HANDLER_GO_ON)
- return -1;
+ /* exec the cgi */
+ execle("/bin/sh", "sh", "-c", b->ptr, (char *)NULL, env.ptr);
-- ldap = p->conf.ldap; /* save temporary ldap connection (TODO: redo ldap) */
-- if (LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
-+ if (p->anon_conf->ldap == NULL ||
-+ LDAP_SUCCESS != (ret = ldap_search_s(p->anon_conf->ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
- log_error_write(srv, __FILE__, __LINE__, "sssb",
- "ldap:", ldap_err2string(ret), "filter:", p->ldap_filter);
-- /* destroy temporary ldap connection (TODO: redo ldap) */
-- ldap_unbind_s(ldap);
- return -1;
- }
- }
- }
+@@ -2163,8 +2174,11 @@
+ int ret;
-- if (NULL == (first = ldap_first_entry(p->conf.ldap, lm))) {
-- /* No matching entry is not an error */
-- /* log_error_write(srv, __FILE__, __LINE__, "s", "ldap ..."); */
-+ if (NULL == (first = ldap_first_entry(p->anon_conf->ldap, lm))) {
-+ log_error_write(srv, __FILE__, __LINE__, "s", "ldap ...");
+ /* sanity check */
+- if (!host ||
+- ((!host->host->used || !host->port) && !host->unixsocket->used)) {
++ if (!host) {
++ log_error_write(srv, __FILE__, __LINE__, "s", "fatal error: host = NULL");
++ return HANDLER_ERROR;
++ }
++ if (((!host->host->used || !host->port) && !host->unixsocket->used)) {
+ log_error_write(srv, __FILE__, __LINE__, "sxddd",
+ "write-req: error",
+ host,
+@@ -2299,8 +2313,8 @@
+
+ chunkqueue_remove_finished_chunks(hctx->wb);
+
+- if (-1 == ret) {
+- if (errno == ENOTCONN) {
++ if (ret < 0) {
++ if (errno == ENOTCONN || ret == -2) {
+ /* the connection got dropped after accept()
+ *
+ * this is most of the time a PHP which dies
+@@ -2325,24 +2339,17 @@
+ */
- ldap_msgfree(lm);
+ log_error_write(srv, __FILE__, __LINE__, "ssosd",
+- "[REPORT ME] connection was dropped after accept(). reconnect() denied:",
++ "connection was dropped after accept(). reconnect() denied:",
+ "write-offset:", hctx->wb->bytes_out,
+ "reconnect attempts:", hctx->reconnects);
-- /* destroy temporary ldap connection (TODO: redo ldap) */
-- if (NULL != ldap) {
-- ldap_unbind_s(ldap);
+ return HANDLER_ERROR;
- }
- return -1;
+-
+- if ((errno != EAGAIN) &&
+- (errno != EINTR)) {
+-
++ } else {
++ /* -1 == ret => error on our side */
+ log_error_write(srv, __FILE__, __LINE__, "ssd",
+- "write failed:", strerror(errno), errno);
++ "write failed:", strerror(errno), errno);
+
+ return HANDLER_ERROR;
+- } else {
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_OUT);
+-
+- return HANDLER_WAIT_FOR_EVENT;
+ }
}
-- if (NULL == (dn = ldap_get_dn(p->conf.ldap, first))) {
-- log_error_write(srv, __FILE__, __LINE__, "s", "ldap: ldap_get_dn failed");
-+ if (NULL == (dn = ldap_get_dn(p->anon_conf->ldap, first))) {
-+ log_error_write(srv, __FILE__, __LINE__, "s", "ldap ...");
+@@ -2469,12 +2476,10 @@
+ }
- ldap_msgfree(lm);
+ static handler_t scgi_connection_close(server *srv, handler_ctx *hctx) {
+- plugin_data *p;
+ connection *con;
-- /* destroy temporary ldap connection (TODO: redo ldap) */
-- if (NULL != ldap) {
-- ldap_unbind_s(ldap);
-- }
- return -1;
- }
+ if (NULL == hctx) return HANDLER_GO_ON;
- ldap_msgfree(lm);
+- p = hctx->plugin_data;
+ con = hctx->remote_conn;
-- /* destroy temporary ldap connection (TODO: redo ldap) */
-- if (NULL != ldap) {
-- ldap_unbind_s(ldap);
-- }
+ log_error_write(srv, __FILE__, __LINE__, "ssdsd",
+@@ -2724,27 +2729,29 @@
+ /* check if extension matches */
+ for (k = 0; k < p->conf.exts->used; k++) {
+ size_t ct_len;
++ scgi_extension *ext = p->conf.exts->exts[k];
- /* 3. */
- if (NULL == (ldap = ldap_init(p->conf.auth_ldap_hostname->ptr, LDAP_PORT))) {
-Index: src/mod_redirect.c
-===================================================================
---- src/mod_redirect.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_redirect.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -178,11 +178,7 @@
+- extension = p->conf.exts->exts[k];
++ if (ext->key->used == 0) continue;
- mod_redirect_patch_connection(srv, con, p);
+- if (extension->key->used == 0) continue;
++ ct_len = ext->key->used - 1;
-- buffer_copy_string_buffer(p->match_buf, con->uri.path);
-- if (con->uri.query->used > 0) {
-- buffer_append_string_len(p->match_buf, CONST_STR_LEN("?"));
-- buffer_append_string_buffer(p->match_buf, con->uri.query);
-- }
-+ buffer_copy_string_buffer(p->match_buf, con->request.uri);
+- ct_len = extension->key->used - 1;
+-
+ if (s_len < ct_len) continue;
+
+ /* check extension in the form "/scgi_pattern" */
+- if (*(extension->key->ptr) == '/') {
+- if (strncmp(fn->ptr, extension->key->ptr, ct_len) == 0)
++ if (*(ext->key->ptr) == '/') {
++ if (strncmp(fn->ptr, ext->key->ptr, ct_len) == 0) {
++ extension = ext;
+ break;
+- } else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
++ }
++ } else if (0 == strncmp(fn->ptr + s_len - ct_len, ext->key->ptr, ct_len)) {
+ /* check extension in the form ".fcg" */
++ extension = ext;
+ break;
+ }
+ }
- for (i = 0; i < p->conf.redirect->used; i++) {
- pcre *match;
-Index: src/http_auth.h
+ /* extension doesn't match */
+- if (k == p->conf.exts->used) {
++ if (NULL == extension) {
+ return HANDLER_GO_ON;
+ }
+
+Index: src/mod_mysql_vhost.c
===================================================================
---- src/http_auth.h (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/http_auth.h (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -63,7 +63,7 @@
+--- src/mod_mysql_vhost.c (.../tags/lighttpd-1.4.23)
++++ src/mod_mysql_vhost.c (.../branches/lighttpd-1.4.x)
+@@ -259,8 +259,14 @@
- mod_auth_plugin_config **config_storage;
+ #define FOO(x) (s->x->used ? s->x->ptr : NULL)
-- mod_auth_plugin_config conf; /* this is only used as long as no handler_ctx is setup */
-+ mod_auth_plugin_config conf, *anon_conf; /* this is only used as long as no handler_ctx is setup */
- } mod_auth_plugin_data;
++#if MYSQL_VERSION_ID >= 40100
++ /* CLIENT_MULTI_STATEMENTS first appeared in 4.1 */
+ if (!mysql_real_connect(s->mysql, FOO(hostname), FOO(myuser), FOO(mypass),
++ FOO(mydb), s->port, FOO(mysock), CLIENT_MULTI_STATEMENTS)) {
++#else
++ if (!mysql_real_connect(s->mysql, FOO(hostname), FOO(myuser), FOO(mypass),
+ FOO(mydb), s->port, FOO(mysock), 0)) {
++#endif
+ log_error_write(srv, __FILE__, __LINE__, "s", mysql_error(s->mysql));
- int http_auth_basic_check(server *srv, connection *con, mod_auth_plugin_data *p, array *req, buffer *url, const char *realm_str);
-Index: src/mod_webdav.c
-===================================================================
---- src/mod_webdav.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_webdav.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -1026,6 +1026,8 @@
- if (MAP_FAILED == (c->file.mmap.start = mmap(0, c->file.length, PROT_READ, MAP_SHARED, c->file.fd, 0))) {
- log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ",
- strerror(errno), c->file.name, c->file.fd);
-+ close(c->file.fd);
-+ c->file.fd = -1;
+ return HANDLER_ERROR;
+@@ -369,6 +375,9 @@
+ if (!row || cols < 1) {
+ /* no such virtual host */
+ mysql_free_result(result);
++#if MYSQL_VERSION_ID >= 40100
++ while (mysql_next_result(p->conf.mysql) == 0);
++#endif
+ return HANDLER_GO_ON;
+ }
+
+@@ -402,6 +411,9 @@
+ c->fcgi_offset = c->fcgi_arg->used = 0;
+ }
+ mysql_free_result(result);
++#if MYSQL_VERSION_ID >= 40100
++ while (mysql_next_result(p->conf.mysql) == 0);
++#endif
+
+ /* fix virtual server and docroot */
+ GO_ON: buffer_copy_string_buffer(con->server_name, c->server_name);
+@@ -416,6 +428,9 @@
+ return HANDLER_GO_ON;
+
+ ERR500: if (result) mysql_free_result(result);
++#if MYSQL_VERSION_ID >= 40100
++ while (mysql_next_result(p->conf.mysql) == 0);
++#endif
+ con->http_status = 500; /* Internal Error */
+ con->mode = DIRECT;
+ return HANDLER_FINISHED;
+@@ -424,15 +439,15 @@
+ /* this function is called at dlopen() time and inits the callbacks */
+ int mod_mysql_vhost_plugin_init(plugin *p);
+ int mod_mysql_vhost_plugin_init(plugin *p) {
+- p->version = LIGHTTPD_VERSION_ID;
+- p->name = buffer_init_string("mysql_vhost");
++ p->version = LIGHTTPD_VERSION_ID;
++ p->name = buffer_init_string("mysql_vhost");
+
+- p->init = mod_mysql_vhost_init;
+- p->cleanup = mod_mysql_vhost_cleanup;
+- p->handle_request_done = mod_mysql_vhost_handle_connection_close;
++ p->init = mod_mysql_vhost_init;
++ p->cleanup = mod_mysql_vhost_cleanup;
++ p->connection_reset = mod_mysql_vhost_handle_connection_close;
+
+- p->set_defaults = mod_mysql_vhost_set_defaults;
+- p->handle_docroot = mod_mysql_vhost_handle_docroot;
++ p->set_defaults = mod_mysql_vhost_set_defaults;
++ p->handle_docroot = mod_mysql_vhost_handle_docroot;
+ return 0;
+ }
+@@ -441,7 +456,7 @@
+ int mod_mysql_vhost_plugin_init(plugin *p);
+ int mod_mysql_vhost_plugin_init(plugin *p) {
+ p->version = LIGHTTPD_VERSION_ID;
+- p->name = buffer_init_string("mysql_vhost");
++ p->name = buffer_init_string("mysql_vhost");
+
+ return 0;
+ }
+Index: src/request.c
+===================================================================
+--- src/request.c (.../tags/lighttpd-1.4.23)
++++ src/request.c (.../branches/lighttpd-1.4.x)
+@@ -111,7 +111,7 @@
+
+ /* check the first character at right of the dot */
+ if (is_ip == 0) {
+- if (!light_isalpha(host->ptr[i+1])) {
++ if (!light_isalnum(host->ptr[i+1])) {
+ return -1;
+ }
+ } else if (!light_isdigit(host->ptr[i+1])) {
+@@ -133,7 +133,7 @@
+ }
+ } else if (i == 0) {
+ /* the first character of the hostname */
+- if (!light_isalpha(c)) {
++ if (!light_isalnum(c)) {
return -1;
}
-@@ -1723,6 +1725,8 @@
- if (MAP_FAILED == (c->file.mmap.start = mmap(0, c->file.length, PROT_READ, MAP_SHARED, c->file.fd, 0))) {
- log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ",
- strerror(errno), c->file.name, c->file.fd);
-+ close(c->file.fd);
-+ c->file.fd = -1;
+ label_len++;
+@@ -540,8 +540,8 @@
+ con->response.keep_alive = 0;
+ con->keep_alive = 0;
+
+- log_error_write(srv, __FILE__, __LINE__, "s", "no uri specified -> 400");
+ if (srv->srvconf.log_request_header_on_error) {
++ log_error_write(srv, __FILE__, __LINE__, "s", "no uri specified -> 400");
+ log_error_write(srv, __FILE__, __LINE__, "Sb",
+ "request-header:\n",
+ con->request.request);
+Index: src/network_backends.h
+===================================================================
+--- src/network_backends.h (.../tags/lighttpd-1.4.23)
++++ src/network_backends.h (.../branches/lighttpd-1.4.x)
+@@ -45,6 +45,11 @@
- return HANDLER_ERROR;
- }
-Index: src/configparser.y
+ #include "base.h"
+
++/* return values:
++ * >= 0 : chunks completed
++ * -1 : error (on our side)
++ * -2 : remote close
++ */
+
+ int network_write_chunkqueue_write(server *srv, connection *con, int fd, chunkqueue *cq);
+ int network_write_chunkqueue_writev(server *srv, connection *con, int fd, chunkqueue *cq);
+Index: src/mod_rrdtool.c
===================================================================
---- src/configparser.y (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/configparser.y (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -427,6 +427,7 @@
- { COMP_HTTP_REFERER, CONST_STR_LEN("HTTP[\"referer\"]" ) },
- { COMP_HTTP_USER_AGENT, CONST_STR_LEN("HTTP[\"useragent\"]" ) },
- { COMP_HTTP_USER_AGENT, CONST_STR_LEN("HTTP[\"user-agent\"]" ) },
-+ { COMP_HTTP_LANGUAGE, CONST_STR_LEN("HTTP[\"language\"]" ) },
- { COMP_HTTP_COOKIE, CONST_STR_LEN("HTTP[\"cookie\"]" ) },
- { COMP_HTTP_REMOTE_IP, CONST_STR_LEN("HTTP[\"remoteip\"]" ) },
- { COMP_HTTP_REMOTE_IP, CONST_STR_LEN("HTTP[\"remote-ip\"]" ) },
-Index: src/mod_compress.c
-===================================================================
---- src/mod_compress.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_compress.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -49,6 +49,7 @@
- buffer *compress_cache_dir;
- array *compress;
- off_t compress_max_filesize; /** max filesize in kb */
-+ int allowed_encodings;
- } plugin_config;
+--- src/mod_rrdtool.c (.../tags/lighttpd-1.4.23)
++++ src/mod_rrdtool.c (.../branches/lighttpd-1.4.x)
+@@ -139,10 +139,8 @@
- typedef struct {
-@@ -154,6 +155,7 @@
- { "compress.cache-dir", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- { "compress.filetype", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },
- { "compress.max-filesize", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },
-+ { "compress.allowed-encodings", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },
- { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
- };
+ args[i++] = p->conf.path_rrdtool_bin->ptr;
+ args[i++] = dash;
+- args[i++] = NULL;
++ args[i ] = NULL;
-@@ -161,15 +163,18 @@
+- openDevNull(STDERR_FILENO);
+-
+ /* we don't need the client socket */
+ for (i = 3; i < 256; i++) {
+ close(i);
+@@ -268,7 +266,7 @@
+ "RRA:MIN:0.5:24:775 "
+ "RRA:MIN:0.5:288:797\n"));
+
+- if (-1 == (r = safe_write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) {
++ if (-1 == (safe_write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss",
+ "rrdtool-write: failed", strerror(errno));
+
+Index: src/stat_cache.c
+===================================================================
+--- src/stat_cache.c (.../tags/lighttpd-1.4.23)
++++ src/stat_cache.c (.../branches/lighttpd-1.4.x)
+@@ -503,12 +503,10 @@
+ }
- for (i = 0; i < srv->config_context->used; i++) {
- plugin_config *s;
-+ array *encodings_arr = array_init();
+ if (NULL == sce) {
+- int osize = 0;
++#ifdef DEBUG_STAT_CACHE
++ int osize = splaytree_size(sc->files);
++#endif
- s = calloc(1, sizeof(plugin_config));
- s->compress_cache_dir = buffer_init();
- s->compress = array_init();
- s->compress_max_filesize = 0;
-+ s->allowed_encodings = 0;
+- if (sc->files) {
+- osize = sc->files->size;
+- }
+-
+ sce = stat_cache_entry_init();
+ buffer_copy_string_buffer(sce->name, name);
- cv[0].destination = s->compress_cache_dir;
- cv[1].destination = s->compress;
- cv[2].destination = &(s->compress_max_filesize);
-+ cv[3].destination = encodings_arr; /* temp array for allowed encodings list */
+Index: src/response.h
+===================================================================
+--- src/response.h (.../tags/lighttpd-1.4.23)
++++ src/response.h (.../branches/lighttpd-1.4.x)
+@@ -10,6 +10,7 @@
- p->config_storage[i] = s;
+ int response_header_insert(server *srv, connection *con, const char *key, size_t keylen, const char *value, size_t vallen);
+ int response_header_overwrite(server *srv, connection *con, const char *key, size_t keylen, const char *value, size_t vallen);
++int response_header_append(server *srv, connection *con, const char *key, size_t keylen, const char *value, size_t vallen);
-@@ -177,6 +182,39 @@
+ handler_t http_response_prepare(server *srv, connection *con);
+ int http_response_redirect_to_directory(server *srv, connection *con);
+Index: src/mod_proxy.c
+===================================================================
+--- src/mod_proxy.c (.../tags/lighttpd-1.4.23)
++++ src/mod_proxy.c (.../branches/lighttpd-1.4.x)
+@@ -756,12 +756,15 @@
+
+ switch(hctx->state) {
+ case PROXY_STATE_INIT:
++#if defined(HAVE_IPV6) && defined(HAVE_INET_PTON)
+ if (strstr(host->host->ptr,":")) {
+ if (-1 == (hctx->fd = socket(AF_INET6, SOCK_STREAM, 0))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socket failed: ", strerror(errno));
+ return HANDLER_ERROR;
+ }
+- } else {
++ } else
++#endif
++ {
+ if (-1 == (hctx->fd = socket(AF_INET, SOCK_STREAM, 0))) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socket failed: ", strerror(errno));
return HANDLER_ERROR;
+@@ -842,17 +845,14 @@
+
+ chunkqueue_remove_finished_chunks(hctx->wb);
+
+- if (-1 == ret) {
+- if (errno != EAGAIN &&
+- errno != EINTR) {
+- log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed:", strerror(errno), errno);
++ if (-1 == ret) { /* error on our side */
++ log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed:", strerror(errno), errno);
+
+- return HANDLER_ERROR;
+- } else {
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_OUT);
++ return HANDLER_WAIT_FOR_EVENT;
++ } else if (-2 == ret) { /* remote close */
++ log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed, remote connection close:", strerror(errno), errno);
+
+- return HANDLER_WAIT_FOR_EVENT;
+- }
++ return HANDLER_WAIT_FOR_EVENT;
}
-+ if (encodings_arr->used) {
-+ size_t j = 0;
-+ for (j = 0; j < encodings_arr->used; j++) {
-+ data_string *ds = (data_string *)encodings_arr->data[j];
-+#ifdef USE_ZLIB
-+ if (NULL != strstr(ds->value->ptr, "gzip"))
-+ s->allowed_encodings |= HTTP_ACCEPT_ENCODING_GZIP;
-+ if (NULL != strstr(ds->value->ptr, "deflate"))
-+ s->allowed_encodings |= HTTP_ACCEPT_ENCODING_DEFLATE;
-+ /*
-+ if (NULL != strstr(ds->value->ptr, "compress"))
-+ s->allowed_encodings |= HTTP_ACCEPT_ENCODING_COMPRESS;
-+ */
-+#endif
-+#ifdef USE_BZ2LIB
-+ if (NULL != strstr(ds->value->ptr, "bzip2"))
-+ s->allowed_encodings |= HTTP_ACCEPT_ENCODING_BZIP2;
-+#endif
-+ }
-+ } else {
-+ /* default encodings */
-+ s->allowed_encodings = 0
-+#ifdef USE_ZLIB
-+ | HTTP_ACCEPT_ENCODING_GZIP | HTTP_ACCEPT_ENCODING_DEFLATE
-+#endif
-+#ifdef USE_BZ2LIB
-+ | HTTP_ACCEPT_ENCODING_BZIP2
-+#endif
-+ ;
-+ }
-+
-+ array_free(encodings_arr);
-+
- if (!buffer_is_empty(s->compress_cache_dir)) {
- struct stat st;
- mkdir_recursive(s->compress_cache_dir->ptr);
-@@ -587,6 +625,7 @@
- PATCH(compress_cache_dir);
- PATCH(compress);
- PATCH(compress_max_filesize);
-+ PATCH(allowed_encodings);
-
- /* skip the first, the global context */
- for (i = 1; i < srv->config_context->used; i++) {
-@@ -606,6 +645,8 @@
- PATCH(compress);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.max-filesize"))) {
- PATCH(compress_max_filesize);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.allowed-encodings"))) {
-+ PATCH(allowed_encodings);
+ if (hctx->wb->bytes_out == hctx->wb->bytes_in) {
+@@ -1107,19 +1107,20 @@
+
+ /* check if extension matches */
+ for (k = 0; k < p->conf.extensions->used; k++) {
++ data_array *ext = NULL;
+ size_t ct_len;
+
+- extension = (data_array *)p->conf.extensions->data[k];
++ ext = (data_array *)p->conf.extensions->data[k];
+
+- if (extension->key->used == 0) continue;
++ if (ext->key->used == 0) continue;
+
+- ct_len = extension->key->used - 1;
++ ct_len = ext->key->used - 1;
+
+ if (s_len < ct_len) continue;
+
+ /* check extension in the form "/proxy_pattern" */
+- if (*(extension->key->ptr) == '/') {
+- if (strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) {
++ if (*(ext->key->ptr) == '/') {
++ if (strncmp(fn->ptr, ext->key->ptr, ct_len) == 0) {
+ if (s_len > ct_len + 1) {
+ char *pi_offset;
+
+@@ -1127,15 +1128,17 @@
+ path_info_offset = pi_offset - fn->ptr;
+ }
+ }
++ extension = ext;
+ break;
}
+- } else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
++ } else if (0 == strncmp(fn->ptr + s_len - ct_len, ext->key->ptr, ct_len)) {
+ /* check extension in the form ".fcg" */
++ extension = ext;
+ break;
}
}
-@@ -619,6 +660,7 @@
- size_t m;
- off_t max_fsize;
- stat_cache_entry *sce = NULL;
-+ buffer *mtime = NULL;
- if (con->mode != DIRECT || con->http_status) return HANDLER_GO_ON;
+- if (k == p->conf.extensions->used) {
++ if (NULL == extension) {
+ return HANDLER_GO_ON;
+ }
-@@ -636,8 +678,30 @@
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am (.../tags/lighttpd-1.4.23)
++++ src/Makefile.am (.../branches/lighttpd-1.4.x)
+@@ -13,14 +13,14 @@
+ versionstamp:
+ @test -f versionstamp.h || touch versionstamp.h; \
+ REVISION=""; \
+- if test -x "`which svnversion`"; then \
+- REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)"; \
++ if test -d "$(top_srcdir)/.svn" -a -x "`which svnversion`"; then \
++ REVISION="$$(LANG= LC_ALL=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)"; \
+ if test "$$REVISION" = "exported"; then \
+ REVISION=""; \
+ fi; \
+ fi; \
+ if test -z "$$REVISION" -a -x "`which git`"; then \
+- REVISION="$$(cd "$(top_srcdir)"; LANG=C git describe --always 2>/dev/null || echo)"; \
++ REVISION="$$(cd "$(top_srcdir)"; LANG= LC_ALL=C git describe --always 2>/dev/null || echo)"; \
+ fi; \
+ if test -n "$$REVISION"; then \
+ echo "#define REPO_VERSION \"-devel-$$REVISION\"" > versionstamp.h.tmp; \
+Index: src/mod_expire.c
+===================================================================
+--- src/mod_expire.c (.../tags/lighttpd-1.4.23)
++++ src/mod_expire.c (.../branches/lighttpd-1.4.x)
+@@ -342,7 +342,7 @@
+ buffer_copy_string_len(p->expire_tstmp, CONST_STR_LEN("max-age="));
+ buffer_append_long(p->expire_tstmp, expires - srv->cur_ts); /* as expires >= srv->cur_ts the difference is >= 0 */
- max_fsize = p->conf.compress_max_filesize;
+- response_header_overwrite(srv, con, CONST_STR_LEN("Cache-Control"), CONST_BUF_LEN(p->expire_tstmp));
++ response_header_append(srv, con, CONST_STR_LEN("Cache-Control"), CONST_BUF_LEN(p->expire_tstmp));
-- stat_cache_get_entry(srv, con, con->physical.path, &sce);
-+ if (con->conf.log_request_handling) {
-+ log_error_write(srv, __FILE__, __LINE__, "s", "-- handling file as static file");
-+ }
+ return HANDLER_GO_ON;
+ }
+Index: src/http_auth.c
+===================================================================
+--- src/http_auth.c (.../tags/lighttpd-1.4.23)
++++ src/http_auth.c (.../branches/lighttpd-1.4.x)
+@@ -918,15 +918,15 @@
+ char a1[256];
+ char a2[256];
+
+- char *username;
+- char *realm;
+- char *nonce;
+- char *uri;
+- char *algorithm;
+- char *qop;
+- char *cnonce;
+- char *nc;
+- char *respons;
++ char *username = NULL;
++ char *realm = NULL;
++ char *nonce = NULL;
++ char *uri = NULL;
++ char *algorithm = NULL;
++ char *qop = NULL;
++ char *cnonce = NULL;
++ char *nc = NULL;
++ char *respons = NULL;
+
+ char *e, *c;
+ const char *m = NULL;
+@@ -967,15 +967,9 @@
+ dkv[6].ptr = &cnonce;
+ dkv[7].ptr = &nc;
+ dkv[8].ptr = &respons;
+- dkv[9].ptr = NULL;
+
+ UNUSED(req);
+
+- for (i = 0; dkv[i].key; i++) {
+- *(dkv[i].ptr) = NULL;
+- }
+-
+-
+ if (p->conf.auth_backend != AUTH_BACKEND_HTDIGEST &&
+ p->conf.auth_backend != AUTH_BACKEND_PLAIN) {
+ log_error_write(srv, __FILE__, __LINE__, "s",
+Index: src/mod_redirect.c
+===================================================================
+--- src/mod_redirect.c (.../tags/lighttpd-1.4.23)
++++ src/mod_redirect.c (.../branches/lighttpd-1.4.x)
+@@ -203,7 +203,7 @@
+ }
+ } else {
+ const char **list;
+- size_t start, end;
++ size_t start;
+ size_t k;
-+ if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path, &sce)) {
-+ con->http_status = 403;
-+
-+ log_error_write(srv, __FILE__, __LINE__, "sbsb",
-+ "not a regular file:", con->uri.path,
-+ "->", con->physical.path);
-+
-+ return HANDLER_FINISHED;
-+ }
-+
-+ /* we only handle regular files */
-+#ifdef HAVE_LSTAT
-+ if ((sce->is_symlink == 1) && !con->conf.follow_symlink) {
-+ return HANDLER_GO_ON;
-+ }
-+#endif
-+ if (!S_ISREG(sce->st.st_mode)) {
-+ return HANDLER_GO_ON;
-+ }
-+
- /* don't compress files that are too large as we need to much time to handle them */
- if (max_fsize && (sce->st.st_size >> 10) > max_fsize) return HANDLER_GO_ON;
-
-@@ -668,27 +732,21 @@
- if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Accept-Encoding"))) {
- int accept_encoding = 0;
- char *value = ds->value->ptr;
-- int srv_encodings = 0;
- int matched_encodings = 0;
-
- /* get client side support encodings */
-+#ifdef USE_ZLIB
- if (NULL != strstr(value, "gzip")) accept_encoding |= HTTP_ACCEPT_ENCODING_GZIP;
- if (NULL != strstr(value, "deflate")) accept_encoding |= HTTP_ACCEPT_ENCODING_DEFLATE;
- if (NULL != strstr(value, "compress")) accept_encoding |= HTTP_ACCEPT_ENCODING_COMPRESS;
-+#endif
-+#ifdef USE_BZ2LIB
- if (NULL != strstr(value, "bzip2")) accept_encoding |= HTTP_ACCEPT_ENCODING_BZIP2;
-+#endif
- if (NULL != strstr(value, "identity")) accept_encoding |= HTTP_ACCEPT_ENCODING_IDENTITY;
+ /* it matched */
+@@ -213,17 +213,15 @@
-- /* get server side supported ones */
--#ifdef USE_BZ2LIB
-- srv_encodings |= HTTP_ACCEPT_ENCODING_BZIP2;
--#endif
--#ifdef USE_ZLIB
-- srv_encodings |= HTTP_ACCEPT_ENCODING_GZIP;
-- srv_encodings |= HTTP_ACCEPT_ENCODING_DEFLATE;
--#endif
+ buffer_reset(p->location);
+
+- start = 0; end = pattern_len;
++ start = 0;
+ for (k = 0; k < pattern_len; k++) {
+ if (pattern[k] == '$' || pattern[k] == '%') {
+ /* got one */
+
+ size_t num = pattern[k + 1] - '0';
+
+- end = k;
++ buffer_append_string_len(p->location, pattern + start, k - start);
+
+- buffer_append_string_len(p->location, pattern + start, end - start);
-
- /* find matching entries */
-- matched_encodings = accept_encoding & srv_encodings;
-+ matched_encodings = accept_encoding & p->conf.allowed_encodings;
+ if (!isdigit((unsigned char)pattern[k + 1])) {
+ /* enable escape: "%%" => "%", "%a" => "%a", "$$" => "$" */
+ buffer_append_string_len(p->location, pattern+k, pattern[k] == pattern[k+1] ? 1 : 2);
+Index: src/mod_webdav.c
+===================================================================
+--- src/mod_webdav.c (.../tags/lighttpd-1.4.23)
++++ src/mod_webdav.c (.../branches/lighttpd-1.4.x)
+@@ -1096,6 +1096,7 @@
+ }
+ #endif
+
++#ifdef USE_LOCKS
+ static int webdav_lockdiscovery(server *srv, connection *con,
+ buffer *locktoken, const char *lockscope, const char *locktype, int depth) {
- if (matched_encodings) {
- const char *dflt_gzip = "gzip";
-@@ -698,6 +756,17 @@
- const char *compression_name = NULL;
- int compression_type = 0;
+@@ -1150,6 +1151,8 @@
-+ mtime = strftime_cache_get(srv, sce->st.st_mtime);
+ return 0;
+ }
++#endif
+
-+ /* try matching original etag of uncompressed version */
-+ etag_mutate(con->physical.etag, sce->etag);
-+ if (HANDLER_FINISHED == http_response_handle_cachable(srv, con, mtime)) {
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
-+ return HANDLER_FINISHED;
-+ }
+ /**
+ * check if resource is having the right locks to access to resource
+ *
+Index: src/configparser.y
+===================================================================
+--- src/configparser.y (.../tags/lighttpd-1.4.23)
++++ src/configparser.y (.../branches/lighttpd-1.4.x)
+@@ -72,7 +72,7 @@
+ op1->free(op1);
+ return (data_unset *)ds;
+ } else {
+- fprintf(stderr, "data type mismatch, cannot be merge\n");
++ fprintf(stderr, "data type mismatch, cannot merge\n");
+ return NULL;
+ }
+ }
+@@ -193,7 +193,6 @@
+ du = configparser_merge_data(du, B);
+ if (NULL == du) {
+ ctx->ok = 0;
+- du->free(du);
+ }
+ else {
+ buffer_copy_string_buffer(du->key, A);
+@@ -470,7 +469,7 @@
+ case CONFIG_COND_MATCH: {
+ #ifdef HAVE_PCRE_H
+ const char *errptr;
+- int erroff;
++ int erroff, captures;
+
+ if (NULL == (dc->regex =
+ pcre_compile(rvalue->ptr, 0, &errptr, &erroff, NULL))) {
+@@ -487,6 +486,14 @@
+ fprintf(stderr, "studying regex failed: %s -> %s\n",
+ rvalue->ptr, errptr);
+ ctx->ok = 0;
++ } else if (0 != (pcre_fullinfo(dc->regex, dc->regex_study, PCRE_INFO_CAPTURECOUNT, &captures))) {
++ fprintf(stderr, "getting capture count for regex failed: %s\n",
++ rvalue->ptr);
++ ctx->ok = 0;
++ } else if (captures > 9) {
++ fprintf(stderr, "Too many captures in regex, use (?:...) instead of (...): %s\n",
++ rvalue->ptr);
++ ctx->ok = 0;
+ } else {
+ dc->string = buffer_init_buffer(rvalue);
+ }
+Index: src/mod_status.c
+===================================================================
+--- src/mod_status.c (.../tags/lighttpd-1.4.23)
++++ src/mod_status.c (.../branches/lighttpd-1.4.x)
+@@ -438,7 +438,7 @@
+
+ buffer_append_string_len(b, CONST_STR_LEN(
+ "<hr />\n<pre><b>legend</b>\n"
+- ". = connect, C = close, E = hard error\n"
++ ". = connect, C = close, E = hard error, k = keep-alive\n"
+ "r = read, R = read-POST, W = write, h = handle-request\n"
+ "q = request-start, Q = request-end\n"
+ "s = response-start, S = response-end\n"));
+@@ -449,8 +449,14 @@
+
+ for (j = 0; j < srv->conns->used; j++) {
+ connection *c = srv->conns->ptr[j];
+- const char *state = connection_get_short_state(c->state);
++ const char *state;
+
++ if (CON_STATE_READ == c->state && c->request.orig_uri->used > 0) {
++ state = "k";
++ } else {
++ state = connection_get_short_state(c->state);
++ }
+
- /* select best matching encoding */
- if (matched_encodings & HTTP_ACCEPT_ENCODING_BZIP2) {
- compression_type = HTTP_ACCEPT_ENCODING_BZIP2;
-@@ -710,41 +779,34 @@
- compression_name = dflt_deflate;
- }
+ buffer_append_string_len(b, state, 1);
-- /* deflate it */
-- if (p->conf.compress_cache_dir->used) {
-- if (0 == deflate_file_to_file(srv, con, p,
-- con->physical.path, sce, compression_type)) {
-- buffer *mtime;
-+ /* try matching etag of compressed version */
-+ buffer_copy_string_buffer(srv->tmp_buf, sce->etag);
-+ buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN("-"));
-+ buffer_append_string(srv->tmp_buf, compression_name);
-+ etag_mutate(con->physical.etag, srv->tmp_buf);
-
-- response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name));
--
-- mtime = strftime_cache_get(srv, sce->st.st_mtime);
-- response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
--
-- etag_mutate(con->physical.etag, sce->etag);
-- response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
--
-- response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
--
-- return HANDLER_GO_ON;
-- }
-- } else if (0 == deflate_file_to_buffer(srv, con, p,
-- con->physical.path, sce, compression_type)) {
-- buffer *mtime;
--
-+ if (HANDLER_FINISHED == http_response_handle_cachable(srv, con, mtime)) {
- response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name));
--
-- mtime = strftime_cache_get(srv, sce->st.st_mtime);
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
- response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
--
-- etag_mutate(con->physical.etag, sce->etag);
- response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
--
-- response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
--
- return HANDLER_FINISHED;
- }
-- break;
-+
-+ /* deflate it */
-+ if (p->conf.compress_cache_dir->used) {
-+ if (0 != deflate_file_to_file(srv, con, p, con->physical.path, sce, compression_type))
-+ return HANDLER_GO_ON;
-+ } else {
-+ if (0 != deflate_file_to_buffer(srv, con, p, con->physical.path, sce, compression_type))
-+ return HANDLER_GO_ON;
-+ }
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
-+ /* let mod_staticfile handle the cached compressed files, physical path was modified */
-+ return p->conf.compress_cache_dir->used ? HANDLER_GO_ON : HANDLER_FINISHED;
- }
- }
- }
-Index: src/spawn-fcgi.c
-===================================================================
---- src/spawn-fcgi.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/spawn-fcgi.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -58,7 +58,7 @@
-
-
- if (unixsocket) {
-- memset(&fcgi_addr, 0, sizeof(fcgi_addr));
-+ memset(&fcgi_addr_un, 0, sizeof(fcgi_addr_un));
-
- fcgi_addr_un.sun_family = AF_UNIX;
- strcpy(fcgi_addr_un.sun_path, unixsocket);
-@@ -72,12 +72,13 @@
- socket_type = AF_UNIX;
- fcgi_addr = (struct sockaddr *) &fcgi_addr_un;
- } else {
-+ memset(&fcgi_addr_in, 0, sizeof(fcgi_addr_in));
- fcgi_addr_in.sin_family = AF_INET;
-- if (addr != NULL) {
-- fcgi_addr_in.sin_addr.s_addr = inet_addr(addr);
-- } else {
-- fcgi_addr_in.sin_addr.s_addr = htonl(INADDR_ANY);
-- }
-+ if (addr != NULL) {
-+ fcgi_addr_in.sin_addr.s_addr = inet_addr(addr);
+ if (((j + 1) % 50) == 0) {
+@@ -497,7 +503,11 @@
+
+ buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"string\">"));
+
+- buffer_append_string(b, connection_get_state(c->state));
++ if (CON_STATE_READ == c->state && c->request.orig_uri->used > 0) {
++ buffer_append_string_len(b, CONST_STR_LEN("keep-alive"));
+ } else {
-+ fcgi_addr_in.sin_addr.s_addr = htonl(INADDR_ANY);
++ buffer_append_string(b, connection_get_state(c->state));
+ }
- fcgi_addr_in.sin_port = htons(port);
- servlen = sizeof(fcgi_addr_in);
-Index: src/mod_auth.c
+ buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"int\">"));
+
+@@ -611,10 +621,10 @@
+ }
+
+ static handler_t mod_status_handle_server_statistics(server *srv, connection *con, void *p_d) {
+- plugin_data *p = p_d;
+- buffer *b = p->module_list;
++ buffer *b;
+ size_t i;
+ array *st = srv->status;
++ UNUSED(p_d);
+
+ if (0 == st->used) {
+ /* we have nothing to send */
+Index: src/mod_ssi.c
===================================================================
---- src/mod_auth.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_auth.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -115,7 +115,7 @@
- PATCH(auth_ldap_starttls);
- PATCH(auth_ldap_allow_empty_pw);
- #ifdef USE_LDAP
-- PATCH(ldap);
-+ p->anon_conf = s;
- PATCH(ldap_filter_pre);
- PATCH(ldap_filter_post);
- #endif
-@@ -149,7 +149,7 @@
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.hostname"))) {
- PATCH(auth_ldap_hostname);
- #ifdef USE_LDAP
-- PATCH(ldap);
-+ p->anon_conf = s;
- #endif
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.base-dn"))) {
- PATCH(auth_ldap_basedn);
-@@ -527,7 +527,7 @@
- }
- }
+--- src/mod_ssi.c (.../tags/lighttpd-1.4.23)
++++ src/mod_ssi.c (.../branches/lighttpd-1.4.x)
+@@ -362,7 +362,8 @@
+ switch(ssicmd) {
+ case SSI_ECHO: {
+ /* echo */
+- int var = 0, enc = 0;
++ int var = 0;
++ /* int enc = 0; */
+ const char *var_val = NULL;
+ stat_cache_entry *sce = NULL;
+
+@@ -381,6 +382,7 @@
+ { NULL, SSI_ECHO_UNSET }
+ };
-- switch(s->auth_backend) {
-+ switch(s->auth_ldap_hostname->used) {
- case AUTH_BACKEND_LDAP: {
- handler_t ret = auth_ldap_init(srv, s);
- if (ret == HANDLER_ERROR)
-@@ -554,6 +554,9 @@
- #endif
++/*
+ struct {
+ const char *var;
+ enum { SSI_ENC_UNSET, SSI_ENC_URL, SSI_ENC_NONE, SSI_ENC_ENTITY } type;
+@@ -391,6 +393,7 @@
- if (s->auth_ldap_hostname->used) {
-+ /* free old context */
-+ if (NULL != s->ldap) ldap_unbind_s(s->ldap);
-+
- if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr, LDAP_PORT))) {
- log_error_write(srv, __FILE__, __LINE__, "ss", "ldap ...", strerror(errno));
+ { NULL, SSI_ENC_UNSET }
+ };
++*/
+
+ for (i = 2; i < n; i += 2) {
+ if (0 == strcmp(l[i], "var")) {
+@@ -405,6 +408,7 @@
+ }
+ }
+ } else if (0 == strcmp(l[i], "encoding")) {
++/*
+ int j;
+
+ for (j = 0; encvars[j].var; j++) {
+@@ -413,6 +417,7 @@
+ break;
+ }
+ }
++*/
+ } else {
+ log_error_write(srv, __FILE__, __LINE__, "sss",
+ "ssi: unknow attribute for ",
+Index: src/mod_auth.c
+===================================================================
+--- src/mod_auth.c (.../tags/lighttpd-1.4.23)
++++ src/mod_auth.c (.../branches/lighttpd-1.4.x)
+@@ -468,7 +468,7 @@
+
+ if (method == NULL) {
+ log_error_write(srv, __FILE__, __LINE__, "ss",
+- "the require field is missing in:",
++ "the method field is missing in:",
+ "auth.require = ( \"...\" => ( ..., \"method\" => \"...\" ) )");
+ return HANDLER_ERROR;
+ } else {
+@@ -483,7 +483,7 @@
+ if (realm == NULL) {
+ log_error_write(srv, __FILE__, __LINE__, "ss",
+- "the require field is missing in:",
++ "the realm field is missing in:",
+ "auth.require = ( \"...\" => ( ..., \"realm\" => \"...\" ) )");
+ return HANDLER_ERROR;
+ }
+Index: src/mod_cml_lua.c
+===================================================================
+--- src/mod_cml_lua.c (.../tags/lighttpd-1.4.23)
++++ src/mod_cml_lua.c (.../branches/lighttpd-1.4.x)
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <time.h>
++#include <string.h>
+
+ #include "mod_cml.h"
+ #include "mod_cml_funcs.h"
Index: src/http-header-glue.c
===================================================================
---- src/http-header-glue.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/http-header-glue.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -280,6 +280,7 @@
+--- src/http-header-glue.c (.../tags/lighttpd-1.4.23)
++++ src/http-header-glue.c (.../branches/lighttpd-1.4.x)
+@@ -104,6 +104,21 @@
+ return response_header_insert(srv, con, key, keylen, value, vallen);
+ }
+
++int response_header_append(server *srv, connection *con, const char *key, size_t keylen, const char *value, size_t vallen) {
++ data_string *ds;
++
++ UNUSED(srv);
++
++ /* if there already is a key by this name append the value */
++ if (NULL != (ds = (data_string *)array_get_element(con->response.headers, key))) {
++ buffer_append_string_len(ds->value, CONST_STR_LEN(", "));
++ buffer_append_string_len(ds->value, value, vallen);
++ return 0;
++ }
++
++ return response_header_insert(srv, con, key, keylen, value, vallen);
++}
++
+ int http_response_redirect_to_directory(server *srv, connection *con) {
+ buffer *o;
+
+@@ -259,7 +274,7 @@
+ }
+
+ if (0 == strncmp(con->request.http_if_modified_since, mtime->ptr, used_len)) {
+- con->http_status = 304;
++ if ('\0' == mtime->ptr[used_len]) con->http_status = 304;
+ return HANDLER_FINISHED;
+ } else {
+ char buf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
+@@ -281,15 +296,16 @@
strncpy(buf, con->request.http_if_modified_since, used_len);
buf[used_len] = '\0';
-+ tm.tm_isdst = 0;
+- tm.tm_isdst = 0;
if (NULL == strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm)) {
con->http_status = 412;
con->mode = DIRECT;
-@@ -329,6 +330,7 @@
+ return HANDLER_FINISHED;
+ }
++ tm.tm_isdst = 0;
+ t_header = mktime(&tm);
+
+ strptime(mtime->ptr, "%a, %d %b %Y %H:%M:%S GMT", &tm);
++ tm.tm_isdst = 0;
+ t_file = mktime(&tm);
+
+ if (t_file > t_header) return HANDLER_GO_ON;
+@@ -318,7 +334,7 @@
+ }
+
+ if (0 == strncmp(con->request.http_if_modified_since, mtime->ptr, used_len)) {
+- con->http_status = 304;
++ if ('\0' == mtime->ptr[used_len]) con->http_status = 304;
+ return HANDLER_FINISHED;
+ } else {
+ char buf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
+@@ -331,18 +347,17 @@
strncpy(buf, con->request.http_if_modified_since, used_len);
buf[used_len] = '\0';
-+ tm.tm_isdst = 0;
+- tm.tm_isdst = 0;
if (NULL == strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm)) {
/**
* parsing failed, let's get out of here
-Index: src/mod_fastcgi.c
+ */
+- log_error_write(srv, __FILE__, __LINE__, "ss",
+- "strptime() failed on", buf);
+ return HANDLER_GO_ON;
+ }
++ tm.tm_isdst = 0;
+ t_header = mktime(&tm);
+
+ strptime(mtime->ptr, "%a, %d %b %Y %H:%M:%S GMT", &tm);
++ tm.tm_isdst = 0;
+ t_file = mktime(&tm);
+
+ if (t_file > t_header) return HANDLER_GO_ON;
+Index: src/mod_setenv.c
===================================================================
---- src/mod_fastcgi.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_fastcgi.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -3252,6 +3252,7 @@
- fcgi_connection_close(srv, hctx);
+--- src/mod_setenv.c (.../tags/lighttpd-1.4.23)
++++ src/mod_setenv.c (.../branches/lighttpd-1.4.x)
+@@ -215,7 +215,7 @@
+ return HANDLER_GO_ON;
+ }
- con->mode = DIRECT;
-+ con->http_status = 0;
- con->file_started = 1; /* fcgi_extension won't touch the request afterwards */
- } else {
- /* we are done */
-@@ -3608,47 +3609,50 @@
- "handling it in mod_fastcgi");
- }
+-REQUESTDONE_FUNC(mod_setenv_reset) {
++CONNECTION_FUNC(mod_setenv_reset) {
+ plugin_data *p = p_d;
-- /* the prefix is the SCRIPT_NAME,
-- * everything from start to the next slash
-- * this is important for check-local = "disable"
-- *
-- * if prefix = /admin.fcgi
-- *
-- * /admin.fcgi/foo/bar
-- *
-- * SCRIPT_NAME = /admin.fcgi
-- * PATH_INFO = /foo/bar
-- *
-- * if prefix = /fcgi-bin/
-- *
-- * /fcgi-bin/foo/bar
-- *
-- * SCRIPT_NAME = /fcgi-bin/foo
-- * PATH_INFO = /bar
-- *
-- * if prefix = /, and fix-root-path-name is enable
-- *
-- * /fcgi-bin/foo/bar
-- *
-- * SCRIPT_NAME = /fcgi-bin/foo
-- * PATH_INFO = /bar
-- *
-- */
-+ /* do not split path info for authorizer */
-+ if (host->mode != FCGI_AUTHORIZER) {
-+ /* the prefix is the SCRIPT_NAME,
-+ * everything from start to the next slash
-+ * this is important for check-local = "disable"
-+ *
-+ * if prefix = /admin.fcgi
-+ *
-+ * /admin.fcgi/foo/bar
-+ *
-+ * SCRIPT_NAME = /admin.fcgi
-+ * PATH_INFO = /foo/bar
-+ *
-+ * if prefix = /fcgi-bin/
-+ *
-+ * /fcgi-bin/foo/bar
-+ *
-+ * SCRIPT_NAME = /fcgi-bin/foo
-+ * PATH_INFO = /bar
-+ *
-+ * if prefix = /, and fix-root-path-name is enable
-+ *
-+ * /fcgi-bin/foo/bar
-+ *
-+ * SCRIPT_NAME = /fcgi-bin/foo
-+ * PATH_INFO = /bar
-+ *
-+ */
-
-- /* the rewrite is only done for /prefix/? matches */
-- if (extension->key->ptr[0] == '/' &&
-- con->uri.path->used > extension->key->used &&
-- NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) {
-- /* rewrite uri.path and pathinfo */
-+ /* the rewrite is only done for /prefix/? matches */
-+ if (extension->key->ptr[0] == '/' &&
-+ con->uri.path->used > extension->key->used &&
-+ NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) {
-+ /* rewrite uri.path and pathinfo */
-
-- buffer_copy_string(con->request.pathinfo, pathinfo);
-+ buffer_copy_string(con->request.pathinfo, pathinfo);
-
-- con->uri.path->used -= con->request.pathinfo->used - 1;
-- con->uri.path->ptr[con->uri.path->used - 1] = '\0';
-- } else if (host->fix_root_path_name && extension->key->ptr[0] == '/' && extension->key->ptr[1] == '\0') {
-- buffer_copy_string(con->request.pathinfo, con->uri.path->ptr);
-- con->uri.path->used = 1;
-- con->uri.path->ptr[con->uri.path->used - 1] = '\0';
-+ con->uri.path->used -= con->request.pathinfo->used - 1;
-+ con->uri.path->ptr[con->uri.path->used - 1] = '\0';
-+ } else if (host->fix_root_path_name && extension->key->ptr[0] == '/' && extension->key->ptr[1] == '\0') {
-+ buffer_copy_string(con->request.pathinfo, con->uri.path->ptr);
-+ con->uri.path->used = 1;
-+ con->uri.path->ptr[con->uri.path->used - 1] = '\0';
-+ }
- }
- }
- } else {
-Index: src/CMakeLists.txt
+ UNUSED(srv);
+@@ -240,7 +240,7 @@
+ p->set_defaults = mod_setenv_set_defaults;
+ p->cleanup = mod_setenv_free;
+
+- p->handle_request_done = mod_setenv_reset;
++ p->connection_reset = mod_setenv_reset;
+
+ p->data = NULL;
+
+Index: src/mod_fastcgi.c
===================================================================
---- src/CMakeLists.txt (.../tags/lighttpd-1.4.20) (revision 0)
-+++ src/CMakeLists.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -0,0 +1,598 @@
-+INCLUDE(CheckCSourceCompiles)
-+INCLUDE(CheckIncludeFiles)
-+INCLUDE(CheckFunctionExists)
-+INCLUDE(CheckVariableExists)
-+INCLUDE(CheckTypeSize)
-+INCLUDE(CheckLibraryExists)
-+INCLUDE(CMakeDetermineCCompiler)
-+INCLUDE(FindThreads)
-+INCLUDE(FindPkgConfig)
-+
-+INCLUDE(LighttpdMacros)
-+
-+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES)
-+
-+OPTION(WITH_XATTR "with xattr-support for the stat-cache [default: off]")
-+OPTION(WITH_MYSQL "with mysql-support for the mod_sql_vhost [default: off]")
-+# OPTION(WITH_POSTGRESQL "with postgress-support for the mod_sql_vhost [default: off]")
-+OPTION(WITH_OPENSSL "with openssl-support [default: off]")
-+OPTION(WITH_PCRE "with regex support [default: on]" ON)
-+OPTION(WITH_WEBDAV_PROPS "with property-support for mod_webdav [default: off]")
-+OPTION(WITH_WEBDAV_LOCKS "locks in webdav [default: off]")
-+OPTION(WITH_BZIP "with bzip2-support for mod_compress [default: off]")
-+OPTION(WITH_ZLIB "with deflate-support for mod_compress [default: on]" ON)
-+OPTION(WITH_LDAP "with LDAP-support for the mod_auth [default: off]")
-+OPTION(WITH_LUA "with lua 5.1 for mod_magnet [default: off]")
-+# OPTION(WITH_VALGRIND "with internal support for valgrind [default: off]")
-+# OPTION(WITH_KERBEROS5 "use Kerberos5 support with OpenSSL [default: off]")
-+OPTION(WITH_FAM "fam/gamin for reducing number of stat() calls [default: off]")
-+OPTION(WITH_GDBM "gdbm storage for mod_trigger_b4_dl [default: off]")
-+OPTION(WITH_MEMCACHE "memcached storage for mod_trigger_b4_dl [default: off]")
-+
-+OPTION(BUILD_STATIC "build a static lighttpd with all modules added")
-+
-+IF(BUILD_STATIC)
-+ SET(LIGHTTPD_STATIC 1)
-+ELSE(BUILD_STATIC)
-+ SET(CMAKE_SHARED_LIBRARY_PREFIX "")
-+ENDIF(BUILD_STATIC)
-+
-+IF(WITH_WEBDAV_PROPS)
-+ SET(WITH_XML 1)
-+ SET(WITH_SQLITE3 1)
-+ SET(WITH_UUID 1)
-+ENDIF(WITH_WEBDAV_PROPS)
-+
-+CHECK_INCLUDE_FILES(sys/devpoll.h HAVE_SYS_DEVPOLL_H)
-+CHECK_INCLUDE_FILES(sys/epoll.h HAVE_SYS_EPOLL_H)
-+CHECK_INCLUDE_FILES(sys/event.h HAVE_SYS_EVENT_H)
-+CHECK_INCLUDE_FILES(sys/mman.h HAVE_SYS_MMAN_H)
-+CHECK_INCLUDE_FILES(sys/poll.h HAVE_SYS_POLL_H)
-+CHECK_INCLUDE_FILES(sys/port.h HAVE_SYS_PORT_H)
-+CHECK_INCLUDE_FILES(sys/prctl.h HAVE_SYS_PRCTL_H)
-+CHECK_INCLUDE_FILES(sys/resource.h HAVE_SYS_RESOURCE_H)
-+CHECK_INCLUDE_FILES(sys/sendfile.h HAVE_SYS_SENDFILE_H)
-+CHECK_INCLUDE_FILES(sys/select.h HAVE_SYS_SELECT_H)
-+CHECK_INCLUDE_FILES(sys/syslimits.h HAVE_SYS_SYSLIMITS_H)
-+CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
-+CHECK_INCLUDE_FILES(sys/uio.h HAVE_SYS_UIO_H)
-+CHECK_INCLUDE_FILES(sys/un.h HAVE_SYS_UN_H)
-+CHECK_INCLUDE_FILES(sys/wait.h HAVE_SYS_WAIT_H)
-+CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
-+CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
-+CHECK_INCLUDE_FILES(pthread.h HAVE_PTHREAD_H)
-+CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H)
-+CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
-+CHECK_INCLUDE_FILES(poll.h HAVE_POLL_H)
-+CHECK_INCLUDE_FILES(pwd.h HAVE_PWD_H)
-+CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H)
-+CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
-+CHECK_INCLUDE_FILES(syslog.h HAVE_SYSLOG_H)
-+
-+# check for fastcgi lib, for the tests only
-+CHECK_INCLUDE_FILES(fastcgi.h HAVE_FASTCGI_H)
-+CHECK_INCLUDE_FILES(fastcgi/fastcgi.h HAVE_FASTCGI_FASTCGI_H)
-+
-+CHECK_INCLUDE_FILES(crypt.h HAVE_CRYPT_H)
-+IF(HAVE_CRYPT_H)
-+ ## check if we need libcrypt for crypt()
-+ CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT)
-+ENDIF(HAVE_CRYPT_H)
-+
-+CHECK_INCLUDE_FILES(sys/inotify.h HAVE_SYS_INOTIFY_H)
-+IF(HAVE_SYS_INOTIFY_H)
-+ CHECK_FUNCTION_EXISTS(inotify_init HAVE_INOTIFY_INIT)
-+ENDIF(HAVE_SYS_INOTIFY_H)
-+
-+SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
-+CHECK_TYPE_SIZE(socklen_t HAVE_SOCKLEN_T)
-+SET(CMAKE_EXTRA_INCLUDE_FILES)
-+
-+CHECK_TYPE_SIZE(long SIZEOF_LONG)
-+CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T)
-+
-+CHECK_FUNCTION_EXISTS(chroot HAVE_CHROOT)
-+CHECK_FUNCTION_EXISTS(crypt HAVE_CRYPT)
-+CHECK_FUNCTION_EXISTS(epoll_ctl HAVE_EPOLL_CTL)
-+CHECK_FUNCTION_EXISTS(fork HAVE_FORK)
-+CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
-+CHECK_FUNCTION_EXISTS(getuid HAVE_GETUID)
-+CHECK_FUNCTION_EXISTS(gmtime_r HAVE_GMTIME_R)
-+CHECK_FUNCTION_EXISTS(inet_ntop HAVE_INET_NTOP)
-+CHECK_FUNCTION_EXISTS(kqueue HAVE_KQUEUE)
-+CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)
-+CHECK_FUNCTION_EXISTS(lstat HAVE_LSTAT)
-+CHECK_FUNCTION_EXISTS(madvise HAVE_MADVISE)
-+CHECK_FUNCTION_EXISTS(memcpy HAVE_MEMCPY)
-+CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)
-+CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
-+CHECK_FUNCTION_EXISTS(pathconf HAVE_PATHCONF)
-+CHECK_FUNCTION_EXISTS(poll HAVE_POLL)
-+CHECK_FUNCTION_EXISTS(port_create HAVE_PORT_CREATE)
-+CHECK_FUNCTION_EXISTS(prctl HAVE_PRCTL)
-+CHECK_FUNCTION_EXISTS(pread HAVE_PREAD)
-+CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE)
-+CHECK_FUNCTION_EXISTS(select HAVE_SELECT)
-+CHECK_FUNCTION_EXISTS(sendfile HAVE_SENDFILE)
-+CHECK_FUNCTION_EXISTS(send_file HAVE_SEND_FILE)
-+CHECK_FUNCTION_EXISTS(sendfile64 HAVE_SENDFILE64)
-+CHECK_FUNCTION_EXISTS(sendfilev HAVE_SENDFILEV)
-+CHECK_FUNCTION_EXISTS(sigaction HAVE_SIGACTION)
-+CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL)
-+CHECK_FUNCTION_EXISTS(sigtimedwait HAVE_SIGTIMEDWAIT)
-+CHECK_FUNCTION_EXISTS(strptime HAVE_STRPTIME)
-+CHECK_FUNCTION_EXISTS(syslog HAVE_SYSLOG)
-+CHECK_FUNCTION_EXISTS(writev HAVE_WRITEV)
-+CHECK_FUNCTION_EXISTS(inet_aton HAVE_INET_ATON)
-+CHECK_C_SOURCE_COMPILES("
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+ #include <netinet/in.h>
-+
-+ int main() {
-+ struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
-+ return 0;
-+ }" HAVE_IPV6)
-+
-+## refactor me
-+MACRO(XCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
-+# reset the variables at the beginning
-+ SET(${_include_DIR})
-+ SET(${_link_DIR})
-+ SET(${_link_FLAGS})
-+ SET(${_cflags})
-+
-+ FIND_PROGRAM(${_package}CONFIG_EXECUTABLE NAMES ${_package} PATHS /usr/local/bin )
-+
-+ # if pkg-config has been found
-+ IF(${_package}CONFIG_EXECUTABLE)
-+ SET(XCONFIG_EXECUTABLE "${${_package}CONFIG_EXECUTABLE}")
-+ MESSAGE(STATUS "found ${_package}: ${XCONFIG_EXECUTABLE}")
-+
-+ EXEC_PROGRAM(${XCONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE __link_FLAGS)
-+ STRING(REPLACE "\n" "" ${_link_FLAGS} ${__link_FLAGS})
-+ EXEC_PROGRAM(${XCONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE __cflags)
-+ STRING(REPLACE "\n" "" ${_cflags} ${__cflags})
-+
-+ ELSE(${_package}CONFIG_EXECUTABLE)
-+ MESSAGE(STATUS "found ${_package}: no")
-+ ENDIF(${_package}CONFIG_EXECUTABLE)
-+ENDMACRO(XCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
-+
-+IF(WITH_XATTR)
-+ CHECK_INCLUDE_FILES(attr/attributes.h HAVE_ATTR_ATTRIBUTES_H)
-+ CHECK_LIBRARY_EXISTS(attr attr_get "" HAVE_XATTR)
-+ENDIF(WITH_XATTR)
-+
-+IF(WITH_MYSQL)
-+ XCONFIG(mysql_config MYSQL_INCDIR MYSQL_LIBDIR MYSQL_LDFLAGS MYSQL_CFLAGS)
-+
-+ SET(CMAKE_REQUIRED_INCLUDES /usr/include/mysql)
-+ CHECK_INCLUDE_FILES(mysql.h HAVE_MYSQL_H)
-+ SET(CMAKE_REQUIRED_INCLUDES)
-+ IF(HAVE_MYSQL_H)
-+ CHECK_LIBRARY_EXISTS(mysqlclient mysql_real_connect "" HAVE_MYSQL)
-+ ENDIF(HAVE_MYSQL_H)
-+ENDIF(WITH_MYSQL)
-+
-+IF(WITH_OPENSSL)
-+ CHECK_INCLUDE_FILES(openssl/ssl.h HAVE_OPENSSL_SSL_H)
-+ IF(HAVE_OPENSSL_SSL_H)
-+ CHECK_LIBRARY_EXISTS(crypto BIO_f_base64 "" HAVE_LIBCRYPTO)
-+ IF(HAVE_LIBCRYPTO)
-+ SET(OPENSSL_NO_KRB5 1)
-+ CHECK_LIBRARY_EXISTS(ssl SSL_new "" HAVE_LIBSSL)
-+ ENDIF(HAVE_LIBCRYPTO)
-+ ENDIF(HAVE_OPENSSL_SSL_H)
-+ENDIF(WITH_OPENSSL)
-+
-+IF(WITH_PCRE)
-+ ## if we have pcre-config, use it
-+ XCONFIG(pcre-config PCRE_INCDIR PCRE_LIBDIR PCRE_LDFLAGS PCRE_CFLAGS)
-+ IF(PCRE_LDFLAGS OR PCRE_CFLAGS)
-+ MESSAGE(STATUS "found pcre at: LDFLAGS: ${PCRE_LDFLAGS} CFLAGS: ${PCRE_CFLAGS}")
-+
-+ IF(NOT PCRE_CFLAGS STREQUAL "\n")
-+ ## if it is empty we'll get newline returned
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PCRE_CFLAGS}")
-+ ENDIF(NOT PCRE_CFLAGS STREQUAL "\n")
-+
-+ SET(HAVE_PCRE_H 1)
-+ SET(HAVE_LIBPCRE 1)
-+ ELSE(PCRE_LDFLAGS OR PCRE_CFLAGS)
-+ IF(NOT WIN32)
-+ CHECK_INCLUDE_FILES(pcre.h HAVE_PCRE_H)
-+ CHECK_LIBRARY_EXISTS(pcre pcre_exec "" HAVE_LIBPCRE)
-+ SET(PCRE_LDFLAGS -lpcre)
-+ ELSE(NOT WIN32)
-+ FIND_PATH(PCRE_INCLUDE_DIR pcre.h
-+ /usr/local/include
-+ /usr/include
-+ )
-+
-+ SET(PCRE_NAMES pcre)
-+ FIND_LIBRARY(PCRE_LIBRARY
-+ NAMES ${PCRE_NAMES}
-+ PATHS /usr/lib /usr/local/lib
-+ )
-+
-+ IF(PCRE_INCLUDE_DIR AND PCRE_LIBRARY)
-+ SET(CMAKE_REQUIRED_INCLUDES ${PCRE_INCLUDE_DIR})
-+ SET(CMAKE_REQUIRED_LIBRARIES ${PCRE_LIBRARY})
-+ CHECK_INCLUDE_FILES(pcre.h HAVE_PCRE_H)
-+ CHECK_LIBRARY_EXISTS(pcre pcre_exec "" HAVE_LIBPCRE)
-+ SET(CMAKE_REQUIRED_INCLUDES)
-+ SET(CMAKE_REQUIRED_LIBRARIES)
-+ INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR})
-+ ENDIF(PCRE_INCLUDE_DIR AND PCRE_LIBRARY)
-+ ENDIF(NOT WIN32)
-+ ENDIF(PCRE_LDFLAGS OR PCRE_CFLAGS)
-+
-+ IF(NOT HAVE_PCRE_H)
-+ MESSAGE(FATAL_ERROR "pcre.h couldn't be found")
-+ ENDIF(NOT HAVE_PCRE_H)
-+ IF(NOT HAVE_LIBPCRE)
-+ MESSAGE(FATAL_ERROR "libpcre couldn't be found")
-+ ENDIF(NOT HAVE_LIBPCRE)
-+
-+ENDIF(WITH_PCRE)
-+
-+
-+IF(WITH_XML)
-+ XCONFIG(xml2-config XML2_INCDIR XML2_LIBDIR XML2_LDFLAGS XML2_CFLAGS)
-+ IF(XML2_LDFLAGS OR XML2_CFLAGS)
-+ MESSAGE(STATUS "found xml2 at: LDFLAGS: ${XML2_LDFLAGS} CFLAGS: ${XML2_CFLAGS}")
-+
-+ ## if it is empty we'll get newline returned
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XML2_CFLAGS}")
-+
-+ CHECK_INCLUDE_FILES(libxml/tree.h HAVE_LIBXML_H)
-+
-+ SET(CMAKE_REQUIRED_FLAGS ${XML2_LDFLAGS})
-+ CHECK_LIBRARY_EXISTS(xml2 xmlParseChunk "" HAVE_LIBXML)
-+ SET(CMAKE_REQUIRED_FLAGS)
-+ ELSE(XML2_LDFLAGS OR XML2_CFLAGS)
-+ CHECK_INCLUDE_FILES(libxml.h HAVE_LIBXML_H)
-+ CHECK_LIBRARY_EXISTS(xml2 xmlParseChunk "" HAVE_LIBXML)
-+ ENDIF(XML2_LDFLAGS OR XML2_CFLAGS)
-+
-+ IF(NOT HAVE_LIBXML_H)
-+ MESSAGE(FATAL_ERROR "libxml/tree.h couldn't be found")
-+ ENDIF(NOT HAVE_LIBXML_H)
-+ IF(NOT HAVE_LIBXML)
-+ MESSAGE(FATAL_ERROR "libxml2 couldn't be found")
-+ ENDIF(NOT HAVE_LIBXML)
-+
-+ENDIF(WITH_XML)
-+
-+IF(WITH_SQLITE3)
-+ CHECK_INCLUDE_FILES(sqlite3.h HAVE_SQLITE3_H)
-+ CHECK_LIBRARY_EXISTS(sqlite3 sqlite3_reset "" HAVE_SQLITE3)
-+ENDIF(WITH_SQLITE3)
-+
-+IF(WITH_UUID)
-+ CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_UUID_H)
-+ CHECK_LIBRARY_EXISTS(uuid uuid_generate "" NEED_LIBUUID)
-+ IF(NOT NEED_LIBUUID)
-+ CHECK_FUNCTION_EXISTS(uuid_generate HAVE_LIBUUID)
-+ ELSE(NOT NEED_LIBUUID)
-+ SET(HAVE_LIBUUID 1)
-+ ENDIF(NOT NEED_LIBUUID)
-+ENDIF(WITH_UUID)
-+
-+IF(WITH_ZLIB)
-+ IF(NOT WIN32)
-+ CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)
-+ CHECK_LIBRARY_EXISTS(z deflate "" HAVE_LIBZ)
-+ SET(ZLIB_LIBRARY z)
-+ ELSE(NOT WIN32)
-+ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-+ /usr/local/include
-+ /usr/include
-+ )
-+
-+ SET(ZLIB_NAMES z zlib zdll)
-+ FIND_LIBRARY(ZLIB_LIBRARY
-+ NAMES ${ZLIB_NAMES}
-+ PATHS /usr/lib /usr/local/lib
-+ )
-+
-+
-+ IF(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-+ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-+ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY})
-+ GET_FILENAME_COMPONENT(ZLIB_NAME ${ZLIB_LIBRARY} NAME)
-+ CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)
-+ CHECK_LIBRARY_EXISTS(${ZLIB_NAME} deflate "" HAVE_LIBZ)
-+ SET(CMAKE_REQUIRED_INCLUDES)
-+ SET(CMAKE_REQUIRED_LIBRARIES)
-+ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-+
-+ ENDIF(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-+ ENDIF(NOT WIN32)
-+ENDIF(WITH_ZLIB)
-+
-+IF(WITH_BZIP)
-+ CHECK_INCLUDE_FILES(bzlib.h HAVE_BZLIB_H)
-+ CHECK_LIBRARY_EXISTS(bz2 BZ2_bzCompress "" HAVE_LIBBZ2)
-+ENDIF(WITH_BZIP)
-+
-+IF(WITH_LDAP)
-+ CHECK_INCLUDE_FILES(ldap.h HAVE_LDAP_H)
-+ CHECK_LIBRARY_EXISTS(ldap ldap_bind "" HAVE_LIBLDAP)
-+ CHECK_INCLUDE_FILES(lber.h HAVE_LBER_H)
-+ CHECK_LIBRARY_EXISTS(lber ber_printf "" HAVE_LIBLBER)
-+ SET(LDAP_DEPRECATED 1) # Using deprecated ldap api
-+ENDIF(WITH_LDAP)
-+
-+IF(WITH_LUA)
-+ pkg_search_module(LUA REQUIRED lua lua5.1)
-+ MESSAGE(STATUS "found lua at: INCDIR: ${LUA_INCLUDE_DIRS} LIBDIR: ${LUA_LIBRARY_DIRS} LDFLAGS: ${LUA_LDFLAGS} CFLAGS: ${LUA_CFLAGS}")
-+ SET(HAVE_LIBLUA 1 "Have liblua")
-+ SET(HAVE_LUA_H 1 "Have liblua header")
-+ENDIF(WITH_LUA)
-+
-+IF(WITH_FAM)
-+ CHECK_INCLUDE_FILES(fam.h HAVE_FAM_H)
-+ CHECK_LIBRARY_EXISTS(fam FAMOpen2 "" HAVE_LIBFAM)
-+ IF(HAVE_LIBFAM)
-+ SET(CMAKE_REQUIRED_LIBRARIES fam)
-+ CHECK_FUNCTION_EXISTS(FAMNoExists HAVE_FAMNOEXISTS)
-+ ENDIF(HAVE_LIBFAM)
-+ENDIF(WITH_FAM)
-+
-+IF(WITH_GDBM)
-+ CHECK_INCLUDE_FILES(gdbm.h HAVE_GDBM_H)
-+ CHECK_LIBRARY_EXISTS(gdbm gdbm_open "" HAVE_GDBM)
-+ENDIF(WITH_GDBM)
-+
-+IF(WITH_MEMCACHE)
-+ CHECK_INCLUDE_FILES(memcache.h HAVE_MEMCACHE_H)
-+ CHECK_LIBRARY_EXISTS(memcache mc_new "" HAVE_MEMCACHE)
-+ENDIF(WITH_MEMCACHE)
-+
-+IF(NOT BUILD_STATIC)
-+ CHECK_INCLUDE_FILES(dlfcn.h HAVE_DLFCN_H)
-+ENDIF(NOT BUILD_STATIC)
-+
-+IF(HAVE_DLFCN_H)
-+ CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
-+ENDIF(HAVE_DLFCN_H)
-+
-+SET(LIGHTTPD_VERSION_ID 10400)
-+SET(PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
-+SET(PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
-+EXEC_PROGRAM(date ARGS "'+%b %d %Y %H:%M:%S UTC'" OUTPUT_VARIABLE PACKAGE_BUILD_DATE)
-+
-+IF(NOT SBINDIR)
-+ SET(SBINDIR "sbin")
-+ENDIF(NOT SBINDIR)
-+
-+IF(NOT LIGHTTPD_MODULES_DIR)
-+ SET(LIGHTTPD_MODULES_DIR "lib${LIB_SUFFIX}/lighttpd")
-+ENDIF(NOT LIGHTTPD_MODULES_DIR)
-+
-+IF(NOT WIN32)
-+ SET(LIGHTTPD_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${LIGHTTPD_MODULES_DIR}")
-+ELSE(NOT WIN32)
-+ ## We use relative path in windows
-+ SET(LIGHTTPD_LIBRARY_DIR "lib")
-+ENDIF(NOT WIN32)
-+
-+## Write out config.h
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-+
-+ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-+
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-+
-+SET(COMMON_SRC
-+ buffer.c log.c
-+ keyvalue.c chunk.c
-+ http_chunk.c stream.c fdevent.c
-+ stat_cache.c plugin.c joblist.c etag.c array.c
-+ data_string.c data_count.c data_array.c
-+ data_integer.c md5.c data_fastcgi.c
-+ fdevent_select.c fdevent_linux_rtsig.c
-+ fdevent_poll.c fdevent_linux_sysepoll.c
-+ fdevent_solaris_devpoll.c fdevent_freebsd_kqueue.c
-+ data_config.c bitset.c
-+ inet_ntop_cache.c crc32.c
-+ connections-glue.c
-+ configfile-glue.c
-+ http-header-glue.c
-+ splaytree.c network_writev.c
-+ network_write.c network_linux_sendfile.c
-+ network_freebsd_sendfile.c
-+ network_solaris_sendfilev.c network_openssl.c
-+ status_counter.c
-+)
-+
-+IF(WIN32)
-+ MESSAGE(STATUS "Adding local getopt implementation.")
-+ SET(COMMON_SRC ${COMMON_SRC} xgetopt.c)
-+ENDIF(WIN32)
-+
-+ADD_EXECUTABLE(lemon lemon.c)
-+
-+## Build parsers by using lemon...
-+LEMON_PARSER(configparser.y)
-+LEMON_PARSER(mod_ssi_exprparser.y)
-+
-+SET(L_INSTALL_TARGETS)
-+
-+ADD_EXECUTABLE(spawn-fcgi spawn-fcgi.c)
-+SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} spawn-fcgi)
-+
-+ADD_EXECUTABLE(lighttpd
-+ server.c
-+ response.c
-+ connections.c
-+ network.c
-+ configfile.c
-+ configparser.c
-+ request.c
-+ proc_open.c
-+ ${COMMON_SRC}
-+)
-+SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd)
-+
-+ADD_AND_INSTALL_LIBRARY(mod_access mod_access.c)
-+ADD_AND_INSTALL_LIBRARY(mod_accesslog mod_accesslog.c)
-+ADD_AND_INSTALL_LIBRARY(mod_alias mod_alias.c)
-+ADD_AND_INSTALL_LIBRARY(mod_auth "mod_auth.c;http_auth_digest.c;http_auth.c")
-+IF(NOT WIN32)
-+ADD_AND_INSTALL_LIBRARY(mod_cgi mod_cgi.c)
-+ENDIF(NOT WIN32)
-+ADD_AND_INSTALL_LIBRARY(mod_cml "mod_cml.c;mod_cml_lua.c;mod_cml_funcs.c")
-+ADD_AND_INSTALL_LIBRARY(mod_compress mod_compress.c)
-+ADD_AND_INSTALL_LIBRARY(mod_dirlisting mod_dirlisting.c)
-+ADD_AND_INSTALL_LIBRARY(mod_evasive mod_evasive.c)
-+ADD_AND_INSTALL_LIBRARY(mod_evhost mod_evhost.c)
-+ADD_AND_INSTALL_LIBRARY(mod_expire mod_expire.c)
-+ADD_AND_INSTALL_LIBRARY(mod_extforward mod_extforward.c)
-+ADD_AND_INSTALL_LIBRARY(mod_fastcgi mod_fastcgi.c)
-+ADD_AND_INSTALL_LIBRARY(mod_flv_streaming mod_flv_streaming.c)
-+ADD_AND_INSTALL_LIBRARY(mod_indexfile mod_indexfile.c)
-+ADD_AND_INSTALL_LIBRARY(mod_magnet "mod_magnet.c;mod_magnet_cache.c")
-+ADD_AND_INSTALL_LIBRARY(mod_mysql_vhost mod_mysql_vhost.c)
-+ADD_AND_INSTALL_LIBRARY(mod_proxy mod_proxy.c)
-+ADD_AND_INSTALL_LIBRARY(mod_redirect mod_redirect.c)
-+ADD_AND_INSTALL_LIBRARY(mod_rewrite mod_rewrite.c)
-+ADD_AND_INSTALL_LIBRARY(mod_rrdtool mod_rrdtool.c)
-+ADD_AND_INSTALL_LIBRARY(mod_scgi mod_scgi.c)
-+ADD_AND_INSTALL_LIBRARY(mod_secdownload mod_secure_download.c)
-+ADD_AND_INSTALL_LIBRARY(mod_setenv mod_setenv.c)
-+ADD_AND_INSTALL_LIBRARY(mod_simple_vhost mod_simple_vhost.c)
-+ADD_AND_INSTALL_LIBRARY(mod_ssi "mod_ssi_exprparser.c;mod_ssi_expr.c;mod_ssi.c")
-+ADD_AND_INSTALL_LIBRARY(mod_staticfile mod_staticfile.c)
-+ADD_AND_INSTALL_LIBRARY(mod_status mod_status.c)
-+ADD_AND_INSTALL_LIBRARY(mod_trigger_b4_dl mod_trigger_b4_dl.c)
-+ADD_AND_INSTALL_LIBRARY(mod_uploadprogress mod_uploadprogress.c)
-+ADD_AND_INSTALL_LIBRARY(mod_userdir mod_userdir.c)
-+ADD_AND_INSTALL_LIBRARY(mod_usertrack mod_usertrack.c)
-+ADD_AND_INSTALL_LIBRARY(mod_webdav mod_webdav.c)
-+
-+IF(HAVE_PCRE_H)
-+ ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS ${PCRE_LDFLAGS})
-+ ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS ${PCRE_CFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_rewrite LINK_FLAGS ${PCRE_LDFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_rewrite COMPILE_FLAGS ${PCRE_CFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_dirlisting LINK_FLAGS ${PCRE_LDFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_dirlisting COMPILE_FLAGS ${PCRE_CFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_redirect LINK_FLAGS ${PCRE_LDFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_redirect COMPILE_FLAGS ${PCRE_CFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_ssi LINK_FLAGS ${PCRE_LDFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_ssi COMPILE_FLAGS ${PCRE_CFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_trigger_b4_dl LINK_FLAGS ${PCRE_LDFLAGS})
-+ ADD_TARGET_PROPERTIES(mod_trigger_b4_dl COMPILE_FLAGS ${PCRE_CFLAGS})
-+ENDIF(HAVE_PCRE_H)
-+
-+ADD_TARGET_PROPERTIES(mod_magnet LINK_FLAGS ${LUA_LDFLAGS})
-+ADD_TARGET_PROPERTIES(mod_magnet COMPILE_FLAGS ${LUA_CFLAGS})
-+
-+ADD_TARGET_PROPERTIES(mod_cml LINK_FLAGS ${LUA_LDFLAGS})
-+ADD_TARGET_PROPERTIES(mod_cml COMPILE_FLAGS ${LUA_CFLAGS})
-+
-+IF(HAVE_MYSQL_H AND HAVE_LIBMYSQL)
-+ TARGET_LINK_LIBRARIES(mod_mysql_vhost mysqlclient)
-+ INCLUDE_DIRECTORIES(/usr/include/mysql)
-+ENDIF(HAVE_MYSQL_H AND HAVE_LIBMYSQL)
-+
-+SET(L_MOD_WEBDAV)
-+IF(HAVE_SQLITE3_H)
-+ SET(L_MOD_WEBDAV ${L_MOD_WEBDAV} sqlite3)
-+ENDIF(HAVE_SQLITE3_H)
-+IF(HAVE_LIBXML_H)
-+ SET_TARGET_PROPERTIES(mod_webdav PROPERTIES LINK_FLAGS ${XML2_LDFLAGS})
-+ENDIF(HAVE_LIBXML_H)
-+IF(HAVE_UUID_H)
-+ IF(NEED_LIBUUID)
-+ SET(L_MOD_WEBDAV ${L_MOD_WEBDAV} uuid)
-+ ENDIF(NEED_LIBUUID)
-+ENDIF(HAVE_UUID_H)
-+
-+TARGET_LINK_LIBRARIES(mod_webdav ${L_MOD_WEBDAV})
-+
-+SET(L_MOD_AUTH)
-+IF(HAVE_LIBCRYPT)
-+ SET(L_MOD_AUTH ${L_MOD_AUTH} crypt)
-+ENDIF(HAVE_LIBCRYPT)
-+
-+IF(HAVE_LDAP_H)
-+ SET(L_MOD_AUTH ${L_MOD_AUTH} ldap lber)
-+ENDIF(HAVE_LDAP_H)
-+TARGET_LINK_LIBRARIES(mod_auth ${L_MOD_AUTH})
-+
-+IF(HAVE_ZLIB_H)
-+ IF(HAVE_BZLIB_H)
-+ TARGET_LINK_LIBRARIES(mod_compress ${ZLIB_LIBRARY} bz2)
-+ ELSE(HAVE_BZLIB_H)
-+ TARGET_LINK_LIBRARIES(mod_compress ${ZLIB_LIBRARY})
-+ ENDIF(HAVE_BZLIB_H)
-+ENDIF(HAVE_ZLIB_H)
-+
-+IF(HAVE_LIBFAM)
-+ TARGET_LINK_LIBRARIES(lighttpd fam)
-+ENDIF(HAVE_LIBFAM)
-+
-+IF(HAVE_GDBM_H)
-+ TARGET_LINK_LIBRARIES(mod_trigger_b4_dl gdbm)
-+ENDIF(HAVE_GDBM_H)
-+
-+IF(HAVE_MEMCACHE_H)
-+ TARGET_LINK_LIBRARIES(mod_trigger_b4_dl memcache)
-+ENDIF(HAVE_MEMCACHE_H)
-+
-+IF(CMAKE_COMPILER_IS_GNUCC)
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -g -Wshadow -W -pedantic")
-+ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2")
-+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
-+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} -O2")
-+ ADD_DEFINITIONS(-D_GNU_SOURCE)
-+ENDIF(CMAKE_COMPILER_IS_GNUCC)
-+
-+SET_TARGET_PROPERTIES(lighttpd PROPERTIES CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-+
-+IF(WIN32)
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVALGRIND")
-+ ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS "-DLI_DECLARE_EXPORTS")
-+ TARGET_LINK_LIBRARIES(lighttpd ws2_32)
-+ TARGET_LINK_LIBRARIES(mod_proxy ws2_32)
-+ TARGET_LINK_LIBRARIES(mod_fcgi ws2_32)
-+ TARGET_LINK_LIBRARIES(mod_scgi ws2_32)
-+ TARGET_LINK_LIBRARIES(mod_ssi ws2_32)
-+
-+ IF(MINGW)
-+ TARGET_LINK_LIBRARIES(lighttpd msvcr70)
-+ ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS "-Wl,-subsystem,console")
-+ ENDIF(MINGW)
-+ENDIF(WIN32)
-+
-+IF(NOT BUILD_STATIC)
-+ IF(HAVE_LIBDL)
-+ TARGET_LINK_LIBRARIES(lighttpd dl)
-+ ENDIF(HAVE_LIBDL)
-+ENDIF(NOT BUILD_STATIC)
-+
-+IF(HAVE_LIBSSL AND HAVE_LIBCRYPTO)
-+ TARGET_LINK_LIBRARIES(lighttpd ssl)
-+ TARGET_LINK_LIBRARIES(lighttpd crypto)
-+ENDIF(HAVE_LIBSSL AND HAVE_LIBCRYPTO)
+--- src/mod_fastcgi.c (.../tags/lighttpd-1.4.23)
++++ src/mod_fastcgi.c (.../branches/lighttpd-1.4.x)
+@@ -122,24 +122,11 @@
+ *
+ */
+
+- unsigned short min_procs;
+ unsigned short max_procs;
+ size_t num_procs; /* how many procs are started */
+ size_t active_procs; /* how many of them are really running */
+
+- unsigned short max_load_per_proc;
+-
+ /*
+- * kick the process from the list if it was not
+- * used for idle_timeout until min_procs is
+- * reached. this helps to get the processlist
+- * small again we had a small peak load.
+- *
+- */
+-
+- unsigned short idle_timeout;
+-
+- /*
+ * time after a disabled remote connection is tried to be re-enabled
+ *
+ *
+@@ -384,6 +371,21 @@
+ /* ok, we need a prototype */
+ static handler_t fcgi_handle_fdevent(void *s, void *ctx, int revents);
+
++static void reset_signals(void) {
++#ifdef SIGTTOU
++ signal(SIGTTOU, SIG_DFL);
++#endif
++#ifdef SIGTTIN
++ signal(SIGTTIN, SIG_DFL);
++#endif
++#ifdef SIGTSTP
++ signal(SIGTSTP, SIG_DFL);
++#endif
++ signal(SIGHUP, SIG_DFL);
++ signal(SIGPIPE, SIG_DFL);
++ signal(SIGUSR1, SIG_DFL);
++}
+
-+IF(NOT WIN32)
-+INSTALL(TARGETS ${L_INSTALL_TARGETS}
-+ RUNTIME DESTINATION ${SBINDIR}
-+ LIBRARY DESTINATION ${LIGHTTPD_MODULES_DIR}
-+ ARCHIVE DESTINATION ${LIGHTTPD_MODULES_DIR}/static)
-+ELSE(NOT WIN32)
-+## HACK to make win32 to install our libraries in desired directory..
-+INSTALL(TARGETS lighttpd
-+ RUNTIME DESTINATION ${SBINDIR}
-+ ARCHIVE DESTINATION lib/static)
-+LIST(REMOVE_ITEM L_INSTALL_TARGETS lighttpd)
-+INSTALL(TARGETS ${L_INSTALL_TARGETS}
-+ RUNTIME DESTINATION ${SBINDIR}/lib
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib/static)
-+ENDIF(NOT WIN32)
-Index: src/mod_accesslog.c
-===================================================================
---- src/mod_accesslog.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/mod_accesslog.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -169,13 +169,13 @@
- if (fields->size == 0) {
- fields->size = 16;
- fields->used = 0;
-- fields->ptr = malloc(fields->size * sizeof(format_fields * ));
-+ fields->ptr = malloc(fields->size * sizeof(format_field * ));
- } else if (fields->used == fields->size) {
- fields->size += 16;
-- fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_fields * ));
-+ fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * ));
- }
+ static void fastcgi_status_copy_procname(buffer *b, fcgi_extension_host *host, fcgi_proc *proc) {
+ buffer_copy_string_len(b, CONST_STR_LEN("fastcgi.backend."));
+ buffer_append_string_buffer(b, host->id);
+@@ -993,8 +995,6 @@
+ close(fcgi_fd);
+ }
-- fields->ptr[fields->used] = malloc(sizeof(format_fields));
-+ fields->ptr[fields->used] = malloc(sizeof(format_field));
- fields->ptr[fields->used]->type = FIELD_STRING;
- fields->ptr[fields->used]->string = buffer_init();
-
-@@ -189,10 +189,10 @@
- if (fields->size == 0) {
- fields->size = 16;
- fields->used = 0;
-- fields->ptr = malloc(fields->size * sizeof(format_fields * ));
-+ fields->ptr = malloc(fields->size * sizeof(format_field * ));
- } else if (fields->used == fields->size) {
- fields->size += 16;
-- fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_fields * ));
-+ fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * ));
+- openDevNull(STDERR_FILENO);
+-
+ /* we don't need the client socket */
+ for (i = 3; i < 256; i++) {
+ close(i);
+@@ -1054,6 +1054,7 @@
+ *c = '/';
}
- /* search for the terminating command */
-@@ -211,7 +211,7 @@
-
- /* found key */
-
-- fields->ptr[fields->used] = malloc(sizeof(format_fields));
-+ fields->ptr[fields->used] = malloc(sizeof(format_field));
- fields->ptr[fields->used]->type = FIELD_FORMAT;
- fields->ptr[fields->used]->field = fmap[j].type;
- fields->ptr[fields->used]->string = NULL;
-@@ -258,7 +258,7 @@
-
- /* found key */
-
-- fields->ptr[fields->used] = malloc(sizeof(format_fields));
-+ fields->ptr[fields->used] = malloc(sizeof(format_field));
- fields->ptr[fields->used]->type = FIELD_FORMAT;
- fields->ptr[fields->used]->field = fmap[j].type;
- fields->ptr[fields->used]->string = buffer_init();
-@@ -291,7 +291,7 @@
-
- /* found key */
-
-- fields->ptr[fields->used] = malloc(sizeof(format_fields));
-+ fields->ptr[fields->used] = malloc(sizeof(format_field));
- fields->ptr[fields->used]->type = FIELD_FORMAT;
- fields->ptr[fields->used]->field = fmap[j].type;
- fields->ptr[fields->used]->string = NULL;
-@@ -321,13 +321,13 @@
- if (fields->size == 0) {
- fields->size = 16;
- fields->used = 0;
-- fields->ptr = malloc(fields->size * sizeof(format_fields * ));
-+ fields->ptr = malloc(fields->size * sizeof(format_field * ));
- } else if (fields->used == fields->size) {
- fields->size += 16;
-- fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_fields * ));
-+ fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * ));
- }
++ reset_signals();
+
+ /* exec the cgi */
+ execve(arg.ptr[0], arg.ptr, env.ptr);
+@@ -1235,20 +1236,17 @@
+
+ { "check-local", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 5 */
+ { "port", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 6 */
+- { "min-procs-not-working", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 7 this is broken for now */
+- { "max-procs", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 8 */
+- { "max-load-per-proc", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 9 */
+- { "idle-timeout", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
+- { "disable-time", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
++ { "max-procs", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 7 */
++ { "disable-time", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 8 */
+
+- { "bin-environment", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 12 */
+- { "bin-copy-environment", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 13 */
++ { "bin-environment", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 9 */
++ { "bin-copy-environment", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
+
+- { "broken-scriptfilename", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 14 */
+- { "allow-x-send-file", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 15 */
+- { "strip-request-uri", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 16 */
+- { "kill-signal", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 17 */
+- { "fix-root-scriptname", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 18 */
++ { "broken-scriptfilename", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
++ { "allow-x-send-file", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 12 */
++ { "strip-request-uri", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 13 */
++ { "kill-signal", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 14 */
++ { "fix-root-scriptname", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 15 */
+
+ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
+ };
+@@ -1267,12 +1265,9 @@
+ buffer_copy_string_buffer(host->id, da_host->key);
+
+ host->check_local = 1;
+- host->min_procs = 4;
+ host->max_procs = 4;
+- host->max_load_per_proc = 1;
+- host->idle_timeout = 60;
+ host->mode = FCGI_RESPONDER;
+- host->disable_time = 60;
++ host->disable_time = 1;
+ host->break_scriptfilename_for_php = 0;
+ host->allow_xsendfile = 0; /* handle X-LIGHTTPD-send-file */
+ host->kill_signal = SIGTERM;
+@@ -1286,19 +1281,16 @@
+
+ fcv[5].destination = &(host->check_local);
+ fcv[6].destination = &(host->port);
+- fcv[7].destination = &(host->min_procs);
+- fcv[8].destination = &(host->max_procs);
+- fcv[9].destination = &(host->max_load_per_proc);
+- fcv[10].destination = &(host->idle_timeout);
+- fcv[11].destination = &(host->disable_time);
++ fcv[7].destination = &(host->max_procs);
++ fcv[8].destination = &(host->disable_time);
+
+- fcv[12].destination = host->bin_env;
+- fcv[13].destination = host->bin_env_copy;
+- fcv[14].destination = &(host->break_scriptfilename_for_php);
+- fcv[15].destination = &(host->allow_xsendfile);
+- fcv[16].destination = host->strip_request_uri;
+- fcv[17].destination = &(host->kill_signal);
+- fcv[18].destination = &(host->fix_root_path_name);
++ fcv[9].destination = host->bin_env;
++ fcv[10].destination = host->bin_env_copy;
++ fcv[11].destination = &(host->break_scriptfilename_for_php);
++ fcv[12].destination = &(host->allow_xsendfile);
++ fcv[13].destination = host->strip_request_uri;
++ fcv[14].destination = &(host->kill_signal);
++ fcv[15].destination = &(host->fix_root_path_name);
+
+ if (0 != config_insert_values_internal(srv, da_host->value, fcv)) {
+ return HANDLER_ERROR;
+@@ -1355,23 +1347,16 @@
+ /* a local socket + self spawning */
+ size_t pno;
+
+- /* HACK: just to make sure the adaptive spawing is disabled */
+- host->min_procs = host->max_procs;
+-
+- if (host->min_procs > host->max_procs) host->max_procs = host->min_procs;
+- if (host->max_load_per_proc < 1) host->max_load_per_proc = 0;
+-
+ if (s->debug) {
+- log_error_write(srv, __FILE__, __LINE__, "ssbsdsbsdsd",
++ log_error_write(srv, __FILE__, __LINE__, "ssbsdsbsd",
+ "--- fastcgi spawning local",
+ "\n\tproc:", host->bin_path,
+ "\n\tport:", host->port,
+ "\n\tsocket", host->unixsocket,
+- "\n\tmin-procs:", host->min_procs,
+ "\n\tmax-procs:", host->max_procs);
+ }
+
+- for (pno = 0; pno < host->min_procs; pno++) {
++ for (pno = 0; pno < host->max_procs; pno++) {
+ fcgi_proc *proc;
-- fields->ptr[fields->used] = malloc(sizeof(format_fields));
-+ fields->ptr[fields->used] = malloc(sizeof(format_field));
- fields->ptr[fields->used]->type = FIELD_STRING;
- fields->ptr[fields->used]->string = buffer_init();
+ proc = fastcgi_process_init();
+@@ -1391,7 +1376,7 @@
+ "--- fastcgi spawning",
+ "\n\tport:", host->port,
+ "\n\tsocket", host->unixsocket,
+- "\n\tcurrent:", pno, "/", host->min_procs);
++ "\n\tcurrent:", pno, "/", host->max_procs);
+ }
-@@ -540,8 +540,9 @@
+ if (fcgi_spawn_connection(srv, p, host, proc)) {
+@@ -1426,7 +1411,6 @@
+
+ host->first = proc;
+
+- host->min_procs = 1;
+ host->max_procs = 1;
+ }
+
+@@ -2739,7 +2723,7 @@
+ log_error_write(srv, __FILE__, __LINE__, "ssbsdsd",
+ "--- fastcgi spawning",
+ "\n\tsocket", proc->connection_name,
+- "\n\tcurrent:", 1, "/", host->min_procs);
++ "\n\tcurrent:", 1, "/", host->max_procs);
+ }
+
+ if (fcgi_spawn_connection(srv, p, host, proc)) {
+@@ -2778,8 +2762,11 @@
+ * - tcp socket (do not check host->host->uses, as it may be not set which means INADDR_LOOPBACK)
+ * - unix socket
+ */
+- if (!host ||
+- (!host->port && !host->unixsocket->used)) {
++ if (!host) {
++ log_error_write(srv, __FILE__, __LINE__, "s", "fatal error: host = NULL");
++ return HANDLER_ERROR;
++ }
++ if ((!host->port && !host->unixsocket->used)) {
+ log_error_write(srv, __FILE__, __LINE__, "sxddd",
+ "write-req: error",
+ host,
+@@ -2787,7 +2774,7 @@
+ host->port,
+ host->unixsocket->used);
+
+- hctx->proc->disabled_until = srv->cur_ts + 10;
++ hctx->proc->disabled_until = srv->cur_ts + hctx->host->disable_time;
+ hctx->proc->state = PROC_STATE_DIED;
+
+ return HANDLER_ERROR;
+@@ -2803,7 +2790,7 @@
+ log_error_write(srv, __FILE__, __LINE__, "ss",
+ "getsockopt failed:", strerror(errno));
+
+- hctx->proc->disabled_until = srv->cur_ts + 10;
++ hctx->proc->disabled_until = srv->cur_ts + hctx->host->disable_time;
+ hctx->proc->state = PROC_STATE_DIED;
return HANDLER_ERROR;
- }
-+#ifdef FD_CLOEXEC
- fcntl(s->log_access_fd, F_SETFD, FD_CLOEXEC);
--
-+#endif
- }
+@@ -2817,7 +2804,7 @@
+ "socket:", hctx->proc->connection_name);
+ }
- return HANDLER_GO_ON;
-@@ -584,6 +585,9 @@
+- hctx->proc->disabled_until = srv->cur_ts + 5;
++ hctx->proc->disabled_until = srv->cur_ts + hctx->host->disable_time;
+
+ if (hctx->proc->is_local) {
+ hctx->proc->state = PROC_STATE_DIED_WAIT_FOR_PID;
+@@ -2910,13 +2897,13 @@
+ /* cool down the backend, it is overloaded
+ * -> EAGAIN */
+
+- log_error_write(srv, __FILE__, __LINE__, "ssdsd",
+- "backend is overloaded; we'll disable it for 2 seconds and send the request to another backend instead:",
++ log_error_write(srv, __FILE__, __LINE__, "sdssdsd",
++ "backend is overloaded; we'll disable it for", hctx->host->disable_time, "seconds and send the request to another backend instead:",
+ "reconnects:", hctx->reconnects,
+ "load:", host->load);
+
+
+- hctx->proc->disabled_until = srv->cur_ts + 2;
++ hctx->proc->disabled_until = srv->cur_ts + hctx->host->disable_time;
+ hctx->proc->state = PROC_STATE_OVERLOADED;
+
+ fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc);
+@@ -2930,18 +2917,18 @@
+ * - ECONNREFUSED for tcp-ip sockets
+ * - ENOENT for unix-domain-sockets
+ *
+- * for check if the host is back in 5 seconds
++ * for check if the host is back in hctx->host->disable_time seconds
+ * */
+
+- hctx->proc->disabled_until = srv->cur_ts + 5;
++ hctx->proc->disabled_until = srv->cur_ts + hctx->host->disable_time;
+ if (hctx->proc->is_local) {
+ hctx->proc->state = PROC_STATE_DIED_WAIT_FOR_PID;
+ } else {
+ hctx->proc->state = PROC_STATE_DIED;
+ }
+
+- log_error_write(srv, __FILE__, __LINE__, "ssdsd",
+- "backend died; we'll disable it for 5 seconds and send the request to another backend instead:",
++ log_error_write(srv, __FILE__, __LINE__, "sdssdsd",
++ "backend died; we'll disable it for", hctx->host->disable_time, "seconds and send the request to another backend instead:",
+ "reconnects:", hctx->reconnects,
+ "load:", host->load);
+
+@@ -3032,11 +3019,6 @@
+ "reconnect attempts:", hctx->reconnects);
return HANDLER_ERROR;
- }
-+#ifdef FD_CLOEXEC
-+ fcntl(s->log_access_fd, F_SETFD, FD_CLOEXEC);
-+#endif
- }
- }
+- case EAGAIN:
+- case EINTR:
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_OUT);
+-
+- return HANDLER_WAIT_FOR_EVENT;
+ default:
+ log_error_write(srv, __FILE__, __LINE__, "ssd",
+ "write failed:", strerror(errno), errno);
+@@ -3266,7 +3248,7 @@
+ log_error_write(srv, __FILE__, __LINE__, "ssbsdsd",
+ "--- fastcgi spawning",
+ "\n\tsocket", proc->connection_name,
+- "\n\tcurrent:", 1, "/", host->min_procs);
++ "\n\tcurrent:", 1, "/", host->max_procs);
+ }
+
+ if (fcgi_spawn_connection(srv, p, host, proc)) {
+@@ -3288,18 +3270,18 @@
+ hctx->reconnects < 5) {
+ fcgi_reconnect(srv, hctx);
-Index: src/fdevent_linux_sysepoll.c
-===================================================================
---- src/fdevent_linux_sysepoll.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/fdevent_linux_sysepoll.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -91,7 +91,7 @@
- if (e & EPOLLHUP) events |= FDEVENT_HUP;
- if (e & EPOLLPRI) events |= FDEVENT_PRI;
+- log_error_write(srv, __FILE__, __LINE__, "ssbsbs",
++ log_error_write(srv, __FILE__, __LINE__, "ssbsBSBs",
+ "response not received, request not sent",
+ "on socket:", proc->connection_name,
+- "for", con->uri.path, ", reconnecting");
++ "for", con->uri.path, "?", con->uri.query, ", reconnecting");
-- return e;
-+ return events;
- }
+ return HANDLER_WAIT_FOR_FD;
+ }
- static int fdevent_linux_sysepoll_event_get_fd(fdevents *ev, size_t ndx) {
-Index: src/server.c
-===================================================================
---- src/server.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/server.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -210,6 +210,7 @@
- srv->srvconf.modules_dir = buffer_init_string(LIBRARY_DIR);
- srv->srvconf.network_backend = buffer_init();
- srv->srvconf.upload_tempdirs = array_init();
-+ srv->srvconf.reject_expect_100_with_417 = 1;
+- log_error_write(srv, __FILE__, __LINE__, "sosbsbs",
++ log_error_write(srv, __FILE__, __LINE__, "sosbsBSBs",
+ "response not received, request sent:", hctx->wb->bytes_out,
+ "on socket:", proc->connection_name,
+- "for", con->uri.path, ", closing connection");
++ "for", con->uri.path, "?", con->uri.query, ", closing connection");
- /* use syslog */
- srv->errorlog_fd = -1;
-@@ -844,15 +845,16 @@
- }
+ fcgi_connection_close(srv, hctx);
- /* set max-conns */
-- if (srv->srvconf.max_conns > srv->max_fds) {
-- /* we can't have more connections than max-fds */
-- srv->max_conns = srv->max_fds;
-+ if (srv->srvconf.max_conns > srv->max_fds/2) {
-+ /* we can't have more connections than max-fds/2 */
-+ log_error_write(srv, __FILE__, __LINE__, "sdd", "can't have more connections than fds/2: ", srv->srvconf.max_conns, srv->max_fds);
-+ srv->max_conns = srv->max_fds/2;
- } else if (srv->srvconf.max_conns) {
- /* otherwise respect the wishes of the user */
- srv->max_conns = srv->srvconf.max_conns;
- } else {
-- /* or use the default */
-- srv->max_conns = srv->max_fds;
-+ /* or use the default: we really don't want to hit max-fds */
-+ srv->max_conns = srv->max_fds/3;
- }
+@@ -3311,10 +3293,10 @@
+ /* response might have been already started, kill the connection */
+ fcgi_connection_close(srv, hctx);
- if (HANDLER_GO_ON != plugins_call_init(srv)) {
-@@ -1243,8 +1245,8 @@
-
- if (srv->cur_ts - con->write_request_ts > con->conf.max_write_idle) {
- /* time - out */
--#if 1
-- log_error_write(srv, __FILE__, __LINE__, "sbsosds",
-+ if (con->conf.log_timeouts) {
-+ log_error_write(srv, __FILE__, __LINE__, "sbsosds",
- "NOTE: a request for",
- con->request.uri,
- "timed out after writing",
-@@ -1252,7 +1254,7 @@
- "bytes. We waited",
- (int)con->conf.max_write_idle,
- "seconds. If this a problem increase server.max-write-idle");
--#endif
-+ }
- connection_set_state(srv, con, CON_STATE_ERROR);
- changed = 1;
- }
-@@ -1295,8 +1297,8 @@
- if (srv->sockets_disabled) {
- /* our server sockets are disabled, why ? */
-
-- if ((srv->cur_fds + srv->want_fds < srv->max_fds * 0.8) && /* we have enough unused fds */
-- (srv->conns->used < srv->max_conns * 0.9) &&
-+ if ((srv->cur_fds + srv->want_fds < srv->max_fds * 8 / 10) && /* we have enough unused fds */
-+ (srv->conns->used <= srv->max_conns * 9 / 10) &&
- (0 == graceful_shutdown)) {
- for (i = 0; i < srv->srv_sockets.used; i++) {
- server_socket *srv_socket = srv->srv_sockets.ptr[i];
-@@ -1308,8 +1310,8 @@
- srv->sockets_disabled = 0;
+- log_error_write(srv, __FILE__, __LINE__, "ssbsbs",
++ log_error_write(srv, __FILE__, __LINE__, "ssbsBSBs",
+ "response already sent out, but backend returned error",
+ "on socket:", proc->connection_name,
+- "for", con->uri.path, ", terminating connection");
++ "for", con->uri.path, "?", con->uri.query, ", terminating connection");
+
+ connection_set_state(srv, con, CON_STATE_ERROR);
}
+@@ -3364,9 +3346,9 @@
+ * even if the FCGI_FIN packet is not received yet
+ */
} else {
-- if ((srv->cur_fds + srv->want_fds > srv->max_fds * 0.9) || /* out of fds */
-- (srv->conns->used > srv->max_conns) || /* out of connections */
-+ if ((srv->cur_fds + srv->want_fds > srv->max_fds * 9 / 10) || /* out of fds */
-+ (srv->conns->used >= srv->max_conns) || /* out of connections */
- (graceful_shutdown)) { /* graceful_shutdown */
-
- /* disable server-fds */
-@@ -1348,7 +1350,7 @@
-
- if (graceful_shutdown) {
- log_error_write(srv, __FILE__, __LINE__, "s", "[note] graceful shutdown started");
-- } else if (srv->conns->used > srv->max_conns) {
-+ } else if (srv->conns->used >= srv->max_conns) {
- log_error_write(srv, __FILE__, __LINE__, "s", "[note] sockets disabled, connection limit reached");
- } else {
- log_error_write(srv, __FILE__, __LINE__, "s", "[note] sockets disabled, out-of-fds");
-Index: src/log.c
-===================================================================
---- src/log.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/log.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -146,6 +146,10 @@
- /* ok, new log is open, close the old one */
- close(srv->errorlog_fd);
- srv->errorlog_fd = new_fd;
-+#ifdef FD_CLOEXEC
-+ /* close fd on exec (cgi) */
-+ fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+#endif
+- log_error_write(srv, __FILE__, __LINE__, "sbsbsd",
++ log_error_write(srv, __FILE__, __LINE__, "sBSbsbsd",
+ "error: unexpected close of fastcgi connection for",
+- con->uri.path,
++ con->uri.path, "?", con->uri.query,
+ "(no fastcgi process on socket:", proc->connection_name, "?)",
+ hctx->state);
+
+@@ -3489,25 +3471,27 @@
+ /* check if extension matches */
+ for (k = 0; k < p->conf.exts->used; k++) {
+ size_t ct_len; /* length of the config entry */
++ fcgi_extension *ext = p->conf.exts->exts[k];
+
+- extension = p->conf.exts->exts[k];
++ if (ext->key->used == 0) continue;
+
+- if (extension->key->used == 0) continue;
++ ct_len = ext->key->used - 1;
+
+- ct_len = extension->key->used - 1;
+-
+ /* check _url_ in the form "/fcgi_pattern" */
+- if (extension->key->ptr[0] == '/') {
++ if (ext->key->ptr[0] == '/') {
+ if ((ct_len <= con->uri.path->used -1) &&
+- (strncmp(con->uri.path->ptr, extension->key->ptr, ct_len) == 0))
++ (strncmp(con->uri.path->ptr, ext->key->ptr, ct_len) == 0)) {
++ extension = ext;
+ break;
+- } else if ((ct_len <= s_len) && (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len))) {
++ }
++ } else if ((ct_len <= s_len) && (0 == strncmp(fn->ptr + s_len - ct_len, ext->key->ptr, ct_len))) {
+ /* check extension in the form ".fcg" */
++ extension = ext;
+ break;
+ }
+ }
+ /* extension doesn't match */
+- if (k == p->conf.exts->used) {
++ if (NULL == extension) {
+ return HANDLER_GO_ON;
}
}
+@@ -3535,8 +3519,8 @@
+ if (!extension->note_is_sent) {
+ extension->note_is_sent = 1;
+
+- log_error_write(srv, __FILE__, __LINE__, "sbsbs",
+- "all handlers for ", con->uri.path,
++ log_error_write(srv, __FILE__, __LINE__, "sBSbsbs",
++ "all handlers for", con->uri.path, "?", con->uri.query,
+ "on", extension->key,
+ "are down.");
+ }
+@@ -3727,107 +3711,12 @@
+ for (n = 0; n < ex->used; n++) {
-Index: src/proc_open.c
-===================================================================
---- src/proc_open.c (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/proc_open.c (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -287,32 +287,33 @@
- }
- /* }}} */
- /* {{{ proc_open_buffer */
--int proc_open_buffer(proc_handler_t *proc, const char *command, buffer *in, buffer *out, buffer *err) {
-+int proc_open_buffer(const char *command, buffer *in, buffer *out, buffer *err) {
-+ proc_handler_t proc;
-
-- UNUSED(err);
--
-- if (proc_open(proc, command) != 0) {
-+ if (proc_open(&proc, command) != 0) {
- return -1;
- }
+ fcgi_proc *proc;
+- unsigned long sum_load = 0;
+ fcgi_extension_host *host;
- if (in) {
-- if (write(proc->in.fd, (void *)in->ptr, in->used) < 0) {
-+ if (write(proc.in.fd, (void *)in->ptr, in->used) < 0) {
- perror("error writing pipe");
- return -1;
- }
- }
-- pipe_close(&proc->in);
-+ pipe_close(&proc.in);
+ host = ex->hosts[n];
- if (out) {
-- proc_read_fd_to_buffer(proc->out.fd, out);
-+ proc_read_fd_to_buffer(proc.out.fd, out);
- }
-- pipe_close(&proc->out);
-+ pipe_close(&proc.out);
+ fcgi_restart_dead_procs(srv, p, host);
- if (err) {
-- proc_read_fd_to_buffer(proc->err.fd, err);
-+ proc_read_fd_to_buffer(proc.err.fd, err);
- }
-- pipe_close(&proc->err);
-+ pipe_close(&proc.err);
+- for (proc = host->first; proc; proc = proc->next) {
+- sum_load += proc->load;
+- }
+-
+- if (host->num_procs &&
+- host->num_procs < host->max_procs &&
+- (sum_load / host->num_procs) > host->max_load_per_proc) {
+- /* overload, spawn new child */
+- if (p->conf.debug) {
+- log_error_write(srv, __FILE__, __LINE__, "s",
+- "overload detected, spawning a new child");
+- }
+-
+- for (proc = host->unused_procs; proc && proc->pid != 0; proc = proc->next);
+-
+- if (proc) {
+- if (proc == host->unused_procs) host->unused_procs = proc->next;
+-
+- if (proc->next) proc->next->prev = NULL;
+-
+- host->max_id++;
+- } else {
+- proc = fastcgi_process_init();
+- proc->id = host->max_id++;
+- }
+-
+- host->num_procs++;
+-
+- if (buffer_is_empty(host->unixsocket)) {
+- proc->port = host->port + proc->id;
+- } else {
+- buffer_copy_string_buffer(proc->unixsocket, host->unixsocket);
+- buffer_append_string_len(proc->unixsocket, CONST_STR_LEN("-"));
+- buffer_append_long(proc->unixsocket, proc->id);
+- }
+-
+- if (fcgi_spawn_connection(srv, p, host, proc)) {
+- log_error_write(srv, __FILE__, __LINE__, "s",
+- "ERROR: spawning fcgi failed.");
+- return HANDLER_ERROR;
+- }
+-
+- proc->prev = NULL;
+- proc->next = host->first;
+- if (host->first) {
+- host->first->prev = proc;
+- }
+- host->first = proc;
+- }
+-
+- for (proc = host->first; proc; proc = proc->next) {
+- if (proc->load != 0) break;
+- if (host->num_procs <= host->min_procs) break;
+- if (proc->pid == 0) continue;
+-
+- if (srv->cur_ts - proc->last_used > host->idle_timeout) {
+- /* a proc is idling for a long time now,
+- * terminate it */
+-
+- if (p->conf.debug) {
+- log_error_write(srv, __FILE__, __LINE__, "ssbsd",
+- "idle-timeout reached; terminating child:",
+- "socket:", proc->connection_name,
+- "pid", proc->pid);
+- }
+-
+-
+- if (proc->next) proc->next->prev = proc->prev;
+- if (proc->prev) proc->prev->next = proc->next;
+-
+- if (proc->prev == NULL) host->first = proc->next;
+-
+- proc->prev = NULL;
+- proc->next = host->unused_procs;
+-
+- if (host->unused_procs) host->unused_procs->prev = proc;
+- host->unused_procs = proc;
+-
+- kill(proc->pid, SIGTERM);
+-
+- proc->state = PROC_STATE_KILLED;
+-
+- log_error_write(srv, __FILE__, __LINE__, "ssbsd",
+- "killed:",
+- "socket:", proc->connection_name,
+- "pid", proc->pid);
+-
+- host->num_procs--;
+-
+- /* proc is now in unused, let the next second handle the next process */
+- break;
+- }
+- }
+-
+ for (proc = host->unused_procs; proc; proc = proc->next) {
+ int status;
-+ proc_close(&proc);
-+
- return 0;
- }
- /* }}} */
-@@ -366,7 +367,7 @@
- RESET();
-
- fprintf(stdout, "test: echo 321 with read\n"); fflush(stdout);
-- if (proc_open_buffer(&proc, "echo 321", NULL, out, err) != 0) {
-+ if (proc_open_buffer("echo 321", NULL, out, err) != 0) {
- ERROR_OUT();
- }
- fprintf(stdout, "result: ->%s<-\n\n", out->ptr); fflush(stdout);
-@@ -374,7 +375,7 @@
-
- fprintf(stdout, "test: echo 123 | " CMD_CAT "\n"); fflush(stdout);
- buffer_copy_string_len(in, CONST_STR_LEN("123\n"));
-- if (proc_open_buffer(&proc, CMD_CAT, in, out, err) != 0) {
-+ if (proc_open_buffer(CMD_CAT, in, out, err) != 0) {
- ERROR_OUT();
- }
- fprintf(stdout, "result: ->%s<-\n\n", out->ptr); fflush(stdout);
-Index: src/proc_open.h
+Index: src/fdevent_poll.c
===================================================================
---- src/proc_open.h (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ src/proc_open.h (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -22,4 +22,4 @@
+--- src/fdevent_poll.c (.../tags/lighttpd-1.4.23)
++++ src/fdevent_poll.c (.../branches/lighttpd-1.4.x)
+@@ -132,7 +132,7 @@
+ if (poll_r & POLLNVAL) r |= FDEVENT_NVAL;
+ if (poll_r & POLLPRI) r |= FDEVENT_PRI;
+
+- return ev->pollfds[ndx].revents;
++ return r;
+ }
- int proc_close(proc_handler_t *ht);
- int proc_open(proc_handler_t *ht, const char *command);
--int proc_open_buffer(proc_handler_t *ht, const char *command, buffer *in, buffer *out, buffer *err);
-+int proc_open_buffer(const char *command, buffer *in, buffer *out, buffer *err);
-Index: tests/mod-proxy.t
+ static int fdevent_poll_event_get_fd(fdevents *ev, size_t ndx) {
+Index: src/fdevent_select.c
===================================================================
---- tests/mod-proxy.t (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/mod-proxy.t (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -8,14 +8,24 @@
-
- use strict;
- use IO::Socket;
--use Test::More tests => 6;
-+use Test::More tests => 9;
- use LightyTest;
+--- src/fdevent_select.c (.../tags/lighttpd-1.4.23)
++++ src/fdevent_select.c (.../branches/lighttpd-1.4.x)
+@@ -38,7 +38,7 @@
+ UNUSED(fde_ndx);
- my $tf_real = LightyTest->new();
- my $tf_proxy = LightyTest->new();
-
- my $t;
-+my $php_child = -1;
-
-+my $phpbin = (defined $ENV{'PHP'} ? $ENV{'PHP'} : '/usr/bin/php-cgi');
-+$ENV{'PHP'} = $phpbin;
-+
-+SKIP: {
-+ skip "PHP already running on port 1026", 1 if $tf_real->listening_on(1026);
-+ skip "no php binary found", 1 unless -x $phpbin;
-+ ok(-1 != ($php_child = $tf_real->spawnfcgi($phpbin, 1026)), "Spawning php");
-+}
-+
- ## we need two procs
- ## 1. the real webserver
- ## 2. the proxy server
-@@ -26,9 +36,9 @@
- $tf_proxy->{PORT} = 2050;
- $tf_proxy->{CONFIGFILE} = 'proxy.conf';
-
--ok($tf_real->start_proc == 0, "Starting lighttpd") or die();
-+ok($tf_real->start_proc == 0, "Starting lighttpd") or goto cleanup;
-
--ok($tf_proxy->start_proc == 0, "Starting lighttpd as proxy") or die();
-+ok($tf_proxy->start_proc == 0, "Starting lighttpd as proxy") or goto cleanup;
-
- $t->{REQUEST} = ( <<EOF
- GET /index.html HTTP/1.0
-@@ -46,6 +56,31 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'Server' => 'Apache 1.3.29' } ];
- ok($tf_proxy->handle_http($t) == 0, 'drop Server from real server');
-
-+SKIP: {
-+ skip "no PHP running on port 1026", 1 unless $tf_real->listening_on(1026);
-+ $t->{REQUEST} = ( <<EOF
-+GET /rewrite/all/some+test%3axxx%20with%20space HTTP/1.0
-+Host: www.example.org
-+EOF
-+ );
-+ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => '/some+test%3axxx%20with%20space' } ];
-+ ok($tf_proxy->handle_http($t) == 0, 'rewrited urls work with encoded path');
-+}
-+
- ok($tf_proxy->stop_proc == 0, "Stopping lighttpd proxy");
+ /* we should be protected by max-fds, but you never know */
+- assert(fd < FD_SETSIZE);
++ assert(fd < ((int)FD_SETSIZE));
- ok($tf_real->stop_proc == 0, "Stopping lighttpd");
-+
-+SKIP: {
-+ skip "PHP not started, cannot stop it", 1 unless $php_child != -1;
-+ ok(0 == $tf_real->endspawnfcgi($php_child), "Stopping php");
-+ $php_child = -1;
-+}
-+
-+exit 0;
-+
-+cleanup:
-+
-+$tf_real->endspawnfcgi($php_child) if $php_child != -1;
-+
-+die();
-Index: tests/CMakeLists.txt
-===================================================================
---- tests/CMakeLists.txt (.../tags/lighttpd-1.4.20) (revision 0)
-+++ tests/CMakeLists.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -0,0 +1,34 @@
-+SET(T_FILES
-+ prepare.sh
-+ cachable.t
-+ core-404-handler.t
-+ core-condition.t
-+ core-keepalive.t
-+ core-request.t
-+ core-response.t
-+ core.t
-+ core-var-include.t
-+ lowercase.t
-+ mod-access.t
-+ mod-auth.t
-+ mod-cgi.t
-+ mod-compress.t
-+ mod-extforward.t
-+ mod-fastcgi.t
-+ mod-proxy.t
-+ mod-redirect.t
-+ mod-rewrite.t
-+ mod-secdownload.t
-+ mod-setenv.t
-+ mod-ssi.t
-+ mod-userdir.t
-+ request.t
-+ symlink.t
-+)
-+
-+FOREACH(it ${T_FILES})
-+ ADD_TEST(${it} "${lighttpd_SOURCE_DIR}/tests/wrapper.sh"
-+ "${lighttpd_SOURCE_DIR}/tests"
-+ "${lighttpd_BINARY_DIR}"
-+ "${lighttpd_SOURCE_DIR}/tests/${it}")
-+ENDFOREACH(it)
-Index: tests/SConscript
-===================================================================
---- tests/SConscript (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/SConscript (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -23,6 +23,7 @@
- mod-auth.t \
- mod-cgi.t \
- mod-compress.t \
-+ mod-compress.conf \
- mod-fastcgi.t \
- mod-redirect.t \
- mod-userdir.t \
-Index: tests/mod-compress.conf
+ if (events & FDEVENT_IN) {
+ FD_SET(fd, &(ev->select_set_read));
+Index: src/CMakeLists.txt
===================================================================
---- tests/mod-compress.conf (.../tags/lighttpd-1.4.20) (revision 0)
-+++ tests/mod-compress.conf (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -0,0 +1,32 @@
-+debug.log-request-handling = "enable"
-+debug.log-response-header = "disable"
-+debug.log-request-header = "disable"
-+
-+server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-+server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
-+
-+## bind to port (default: 80)
-+server.port = 2048
-+
-+## bind to localhost (default: all interfaces)
-+server.bind = "localhost"
-+server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
-+server.name = "www.example.org"
-+
-+server.modules = (
-+ "mod_compress"
-+)
-+
-+######################## MODULE CONFIG ############################
-+
-+mimetype.assign = (
-+ ".html" => "text/html",
-+ ".txt" => "text/plain",
-+)
-+
-+$HTTP["host"] == "cache.example.org" {
-+ compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
-+}
-+compress.filetype = ("text/plain", "text/html")
-+
-+compress.allowed-encodings = ( "gzip", "deflate" )
-Index: tests/mod-fastcgi.t
+Index: src/server.c
===================================================================
---- tests/mod-fastcgi.t (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/mod-fastcgi.t (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -7,7 +7,7 @@
- }
+--- src/server.c (.../tags/lighttpd-1.4.23)
++++ src/server.c (.../branches/lighttpd-1.4.x)
+@@ -187,6 +187,7 @@
+ CLEAN(cond_check_buf);
- use strict;
--use Test::More tests => 49;
-+use Test::More tests => 50;
- use LightyTest;
+ CLEAN(srvconf.errorlog_file);
++ CLEAN(srvconf.breakagelog_file);
+ CLEAN(srvconf.groupname);
+ CLEAN(srvconf.username);
+ CLEAN(srvconf.changeroot);
+@@ -242,8 +243,8 @@
+ srv->srvconf.reject_expect_100_with_417 = 1;
- my $tf = LightyTest->new();
-@@ -215,7 +215,7 @@
- }
+ /* use syslog */
+- srv->errorlog_fd = -1;
+- srv->errorlog_mode = ERRORLOG_STDERR;
++ srv->errorlog_fd = STDERR_FILENO;
++ srv->errorlog_mode = ERRORLOG_FD;
+
+ srv->split_vals = array_init();
+
+@@ -271,6 +272,7 @@
+ CLEAN(cond_check_buf);
+
+ CLEAN(srvconf.errorlog_file);
++ CLEAN(srvconf.breakagelog_file);
+ CLEAN(srvconf.groupname);
+ CLEAN(srvconf.username);
+ CLEAN(srvconf.changeroot);
+@@ -717,7 +719,7 @@
+ }
- SKIP: {
-- skip "no fcgi-auth found", 4 unless -x $tf->{BASEDIR}."/tests/fcgi-auth" || -x $tf->{BASEDIR}."/tests/fcgi-auth.exe";
-+ skip "no fcgi-auth found", 5 unless -x $tf->{BASEDIR}."/tests/fcgi-auth" || -x $tf->{BASEDIR}."/tests/fcgi-auth.exe";
-
- $tf->{CONFIGFILE} = 'fastcgi-auth.conf';
- ok($tf->start_proc == 0, "Starting lighttpd with $tf->{CONFIGFILE}") or die();
-@@ -235,6 +235,14 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
- ok($tf->handle_http($t) == 0, 'FastCGI - Auth');
-
-+ $t->{REQUEST} = ( <<EOF
-+GET /expire/access.txt?ok HTTP/1.0
-+Host: www.example.org
-+EOF
-+ );
-+ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ ok($tf->handle_http($t) == 0, 'FastCGI - Auth in subdirectory');
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
- }
+ if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
+- srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
++ srv->max_fds = rlim.rlim_cur < ((int)FD_SETSIZE) - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
+ } else {
+ srv->max_fds = rlim.rlim_cur;
+ }
+@@ -730,7 +732,7 @@
+ #endif
+ if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
+ /* don't raise the limit above FD_SET_SIZE */
+- if (srv->max_fds > FD_SETSIZE - 200) {
++ if (srv->max_fds > ((int)FD_SETSIZE) - 200) {
+ log_error_write(srv, __FILE__, __LINE__, "sd",
+ "can't raise max filedescriptors above", FD_SETSIZE - 200,
+ "if event-handler is 'select'. Use 'poll' or something else or reduce server.max-fds.");
+@@ -780,7 +782,7 @@
+ * Change group before chroot, when we have access
+ * to /etc/group
+ * */
+- if (srv->srvconf.groupname->used) {
++ if (NULL != grp) {
+ setgid(grp->gr_gid);
+ setgroups(0, NULL);
+ if (srv->srvconf.username->used) {
+@@ -804,7 +806,7 @@
+ #endif
+ #ifdef HAVE_PWD_H
+ /* drop root privs */
+- if (srv->srvconf.username->used) {
++ if (NULL != pwd) {
+ setuid(pwd->pw_uid);
+ }
+ #endif
+@@ -843,7 +845,7 @@
+ }
-Index: tests/mod-rewrite.t
+ if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
+- srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
++ srv->max_fds = rlim.rlim_cur < ((int)FD_SETSIZE) - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
+ } else {
+ srv->max_fds = rlim.rlim_cur;
+ }
+@@ -857,7 +859,7 @@
+ #endif
+ if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
+ /* don't raise the limit above FD_SET_SIZE */
+- if (srv->max_fds > FD_SETSIZE - 200) {
++ if (srv->max_fds > ((int)FD_SETSIZE) - 200) {
+ log_error_write(srv, __FILE__, __LINE__, "sd",
+ "can't raise max filedescriptors above", FD_SETSIZE - 200,
+ "if event-handler is 'select'. Use 'poll' or something else or reduce server.max-fds.");
+Index: src/mod_dirlisting.c
===================================================================
---- tests/mod-rewrite.t (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/mod-rewrite.t (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -8,7 +8,7 @@
+--- src/mod_dirlisting.c (.../tags/lighttpd-1.4.23)
++++ src/mod_dirlisting.c (.../branches/lighttpd-1.4.x)
+@@ -198,7 +198,7 @@
+ data_unset *du;
+
+ if (NULL != (du = array_get_element(ca, option))) {
+- data_array *da = (data_array *)du;
++ data_array *da;
+ size_t j;
+
+ if (du->type != TYPE_ARRAY) {
+Index: src/mod_magnet.c
+===================================================================
+--- src/mod_magnet.c (.../tags/lighttpd-1.4.23)
++++ src/mod_magnet.c (.../branches/lighttpd-1.4.x)
+@@ -283,17 +283,11 @@
+ }
- use strict;
- use IO::Socket;
--use Test::More tests => 8;
-+use Test::More tests => 7;
- use LightyTest;
+ static int magnet_reqhdr_get(lua_State *L) {
+- server *srv;
+ connection *con;
+ data_string *ds;
- my $tf = LightyTest->new();
-@@ -35,7 +35,7 @@
- );
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => '' } ];
- ok($tf->handle_http($t) == 0, 'valid request');
--
-+
- $t->{REQUEST} = ( <<EOF
- GET /rewrite/foo?a=b HTTP/1.0
- Host: www.example.org
-@@ -52,14 +52,6 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'bar&a=b' } ];
- ok($tf->handle_http($t) == 0, 'valid request');
-
-- $t->{REQUEST} = ( <<EOF
--GET %2Frewrite/f%6Fo?a=b HTTP/1.0
--Host: www.example.org
--EOF
-- );
-- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'a=b' } ];
-- ok($tf->handle_http($t) == 0, 'valid request with url encoded characters');
--
- ok($tf->stop_proc == 0, "Stopping lighttpd");
- }
+ const char *key = luaL_checkstring(L, 2);
-Index: tests/lighttpd.conf
+- lua_pushstring(L, "lighty.srv");
+- lua_gettable(L, LUA_REGISTRYINDEX);
+- srv = lua_touserdata(L, -1);
+- lua_pop(L, 1);
+-
+ lua_pushstring(L, "lighty.con");
+ lua_gettable(L, LUA_REGISTRYINDEX);
+ con = lua_touserdata(L, -1);
+Index: src/log.c
===================================================================
---- tests/lighttpd.conf (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/lighttpd.conf (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -217,4 +217,5 @@
+--- src/log.c (.../tags/lighttpd-1.4.23)
++++ src/log.c (.../branches/lighttpd-1.4.x)
+@@ -62,7 +62,6 @@
+ /* create write pipe and spawn process */
- $HTTP["host"] == "etag.example.org" {
- static-file.etags = "disable"
-+ compress.filetype = ()
- }
-Index: tests/fastcgi-auth.conf
-===================================================================
---- tests/fastcgi-auth.conf (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/fastcgi-auth.conf (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -89,6 +89,7 @@
- "bin-path" => env.SRCDIR + "/fcgi-auth",
- "mode" => "authorizer",
- "docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/",
-+ "check-local" => "disable",
+ int to_log_fds[2];
+- pid_t pid;
- )
- )
-Index: tests/proxy.conf
-===================================================================
---- tests/proxy.conf (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/proxy.conf (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -122,7 +122,8 @@
- url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
-
- url.rewrite = ( "^/rewrite/foo($|\?.+)" => "/indexfile/rewrite.php$1",
-- "^/rewrite/bar(?:$|\?(.+))" => "/indexfile/rewrite.php?bar&$1" )
-+ "^/rewrite/bar(?:$|\?(.+))" => "/indexfile/rewrite.php?bar&$1",
-+ "^/rewrite/all(/.*)$" => "/indexfile/rewrite.php?$1" )
-
- expire.url = ( "/expire/access" => "access 2 hours",
- "/expire/modification" => "access plus 1 seconds 2 minutes")
-Index: tests/Makefile.am
-===================================================================
---- tests/Makefile.am (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/Makefile.am (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -38,6 +38,7 @@
- mod-auth.t \
- mod-cgi.t \
- mod-compress.t \
-+ mod-compress.conf \
- mod-fastcgi.t \
- mod-redirect.t \
- mod-rewrite.t \
-Index: tests/mod-compress.t
-===================================================================
---- tests/mod-compress.t (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ tests/mod-compress.t (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -8,12 +8,14 @@
-
- use strict;
- use IO::Socket;
--use Test::More tests => 10;
-+use Test::More tests => 11;
- use LightyTest;
-
- my $tf = LightyTest->new();
- my $t;
-
-+$tf->{CONFIGFILE} = 'mod-compress.conf';
-+
- ok($tf->start_proc == 0, "Starting lighttpd") or die();
-
- $t->{REQUEST} = ( <<EOF
-@@ -88,5 +90,14 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Vary' => '', 'Content-Type' => "text/plain" } ];
- ok($tf->handle_http($t) == 0, 'Empty Accept-Encoding');
-
-+$t->{REQUEST} = ( <<EOF
-+GET /index.txt HTTP/1.0
-+Accept-Encoding: bzip2, gzip, deflate
-+Host: cache.example.org
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Vary' => '', 'Content-Encoding' => 'gzip', 'Content-Type' => "text/plain" } ];
-+ok($tf->handle_http($t) == 0, 'bzip2 requested but disabled');
+ if (pipe(to_log_fds)) {
+ log_error_write(srv, __FILE__, __LINE__, "ss", "pipe failed: ", strerror(errno));
+@@ -70,7 +69,7 @@
+ }
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
-Index: doc/redirect.txt
-===================================================================
---- doc/redirect.txt (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ doc/redirect.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -39,3 +39,9 @@
- $HTTP["host"] =~ "^www\.(.*)" {
- url.redirect = ( "^/(.*)" => "http://%1/$1" )
- }
-+
-+Warning
-+=======
-+
-+Do NOT use mod_redirect to protect specific urls, as the original url passed from the client
-+is matched against your rules, for example strings like "/abc/../xyz%2f/path".
-Index: doc/compress.txt
-===================================================================
---- doc/compress.txt (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ doc/compress.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -6,13 +6,7 @@
- Module: mod_compress
- --------------------
-
--:Author: Jan Kneschke
--:Date: $Date$
--:Revision: $Revision$
-
--:abstract:
-- a nice, short abstrace about the module
+ /* fork, execve */
+- switch (pid = fork()) {
++ switch (fork()) {
+ case 0:
+ /* child */
+ close(STDIN_FILENO);
+@@ -150,14 +149,14 @@
+ */
+
+ int log_error_open(server *srv) {
+- int close_stderr = 1;
-
- .. meta::
- :keywords: lighttpd, compress
-
-@@ -22,16 +16,57 @@
- ===========
+ #ifdef HAVE_SYSLOG_H
+ /* perhaps someone wants to use syslog() */
+ openlog("lighttpd", LOG_CONS | LOG_PID, LOG_DAEMON);
+ #endif
+- srv->errorlog_mode = ERRORLOG_STDERR;
- 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.
++ srv->errorlog_mode = ERRORLOG_FD;
++ srv->errorlog_fd = STDERR_FILENO;
++
+ if (srv->srvconf.errorlog_use_syslog) {
+ srv->errorlog_mode = ERRORLOG_SYSLOG;
+ } else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
+@@ -171,20 +170,36 @@
--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.
+ log_error_write(srv, __FILE__, __LINE__, "s", "server started");
--The server negotiates automaticly which compression method is used.
--Supported are gzip, deflate, bzip.
-+We currently limit to compression support to static files.
+-#ifdef HAVE_VALGRIND_VALGRIND_H
+- /* don't close stderr for debugging purposes if run in valgrind */
+- if (RUNNING_ON_VALGRIND) close_stderr = 0;
+-#endif
+-
+- if (srv->errorlog_mode == ERRORLOG_STDERR && srv->srvconf.dont_daemonize) {
++ if (srv->errorlog_mode == ERRORLOG_FD && !srv->srvconf.dont_daemonize) {
+ /* We can only log to stderr in dont-daemonize mode;
+ * if we do daemonize and no errorlog file is specified, we log into /dev/null
+ */
+- close_stderr = 0;
++ srv->errorlog_fd = -1;
+ }
-+Caching
-+-------
-+
-+mod_compress can store compressed files on disk to optimize the compression
-+on a second request away. As soon as compress.cache-dir is set the files are
-+compressed.
-+
-+(You will need to create the cache directory if it doesn't already exist. The web server will not do this for you. The directory will also need the proper ownership. For Debian/Ubuntu the user and group ids should both be www-data.)
-+
-+The names of the cache files are made of the filename, the compression method
-+and the etag associated to the file.
-+
-+Cleaning the cache is left to the user. A cron job deleting files older than
-+10 days could do it: ::
-+
-+ find /var/www/cache -type f -mtime +10 | xargs -r rm
-+
-+Limitations
-+-----------
+- /* move stderr to /dev/null */
+- if (close_stderr) openDevNull(STDERR_FILENO);
++ if (!buffer_is_empty(srv->srvconf.breakagelog_file)) {
++ int breakage_fd;
++ const char *logfile = srv->srvconf.breakagelog_file->ptr;
+
-+The module limits the compression of files to files smaller than 128 MByte and
-+larger than 128 Byte.
-+
-+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 sensibly with
-+memory and cpu-time.
++ if (srv->errorlog_mode == ERRORLOG_FD) {
++ srv->errorlog_fd = dup(STDERR_FILENO);
++#ifdef FD_CLOEXEC
++ fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
++#endif
++ }
+
-+Directories containing a tilde ('~') are not created automatically (See ticket
-+#113). To enable compression for user dirs you have to create the directories
-+by hand in the cache directory.
++ if (-1 == (breakage_fd = open_logfile_or_pipe(srv, logfile))) {
++ return -1;
++ }
+
- Options
- =======
++ if (STDERR_FILENO != breakage_fd) {
++ dup2(breakage_fd, STDERR_FILENO);
++ close(breakage_fd);
++ }
++ } else if (!srv->srvconf.dont_daemonize) {
++ /* move stderr to /dev/null */
++ openDevNull(STDERR_FILENO);
++ }
+ return 0;
+ }
-+compress.allowed-encodings
-+ override default set of allowed encodings
-+
-+ e.g.: ::
-+
-+ compress.allowed-encodings = ("bzip2", "gzip", "deflate")
-+
- compress.cache-dir
- name of the directory where compressed content will be cached
+@@ -235,15 +250,19 @@
+ switch(srv->errorlog_mode) {
+ case ERRORLOG_PIPE:
+ case ERRORLOG_FILE:
+- close(srv->errorlog_fd);
++ case ERRORLOG_FD:
++ if (-1 != srv->errorlog_fd) {
++ /* don't close STDERR */
++ if (STDERR_FILENO != srv->errorlog_fd)
++ close(srv->errorlog_fd);
++ srv->errorlog_fd = -1;
++ }
+ break;
+ case ERRORLOG_SYSLOG:
+ #ifdef HAVE_SYSLOG_H
+ closelog();
+ #endif
+ break;
+- case ERRORLOG_STDERR:
+- break;
+ }
-@@ -47,20 +82,111 @@
- Default: not set, compress the file for every request
+ return 0;
+@@ -255,7 +274,8 @@
+ switch(srv->errorlog_mode) {
+ case ERRORLOG_PIPE:
+ case ERRORLOG_FILE:
+- case ERRORLOG_STDERR:
++ case ERRORLOG_FD:
++ if (-1 == srv->errorlog_fd) return 0;
+ /* cache the generated timestamp */
+ if (srv->cur_ts != srv->last_generated_debug_ts) {
+ buffer_prepare_copy(srv->ts_debug_str, 255);
+@@ -349,13 +369,10 @@
+ switch(srv->errorlog_mode) {
+ case ERRORLOG_PIPE:
+ case ERRORLOG_FILE:
++ case ERRORLOG_FD:
+ buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("\n"));
+ write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
+ break;
+- case ERRORLOG_STDERR:
+- buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("\n"));
+- write(STDERR_FILENO, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
+- break;
+ case ERRORLOG_SYSLOG:
+ syslog(LOG_ERR, "%s", srv->errorlog_buf->ptr);
+ break;
+Index: src/proc_open.c
+===================================================================
+--- src/proc_open.c (.../tags/lighttpd-1.4.23)
++++ src/proc_open.c (.../branches/lighttpd-1.4.x)
+@@ -309,6 +309,14 @@
- compress.filetype
-- mimetypes where might get compressed
-+ mimetypes which might get compressed
+ if (err) {
+ proc_read_fd_to_buffer(proc.err.fd, err);
++ } else {
++ buffer *tmp = buffer_init();
++ proc_read_fd_to_buffer(proc.err.fd, tmp);
++ if (tmp->used > 0 && write(2, (void*)tmp->ptr, tmp->used) < 0) {
++ perror("error writing pipe");
++ return -1;
++ }
++ buffer_free(tmp);
+ }
+ pipe_close(&proc.err);
- e.g.: ::
+Index: tests/.cvsignore
+===================================================================
+Index: tests/bug-12.conf
+===================================================================
+--- tests/bug-12.conf (.../tags/lighttpd-1.4.23)
++++ tests/bug-12.conf (.../branches/lighttpd-1.4.x)
+@@ -8,6 +8,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/fastcgi-10.conf
+===================================================================
+--- tests/fastcgi-10.conf (.../tags/lighttpd-1.4.23)
++++ tests/fastcgi-10.conf (.../branches/lighttpd-1.4.x)
+@@ -6,6 +6,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/bug-06.conf
+===================================================================
+--- tests/bug-06.conf (.../tags/lighttpd-1.4.23)
++++ tests/bug-06.conf (.../branches/lighttpd-1.4.x)
+@@ -8,6 +8,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/mod-extforward.conf
+===================================================================
+Index: tests/var-include.conf
+===================================================================
+--- tests/var-include.conf (.../tags/lighttpd-1.4.23)
++++ tests/var-include.conf (.../branches/lighttpd-1.4.x)
+@@ -10,6 +10,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/404-handler.conf
+===================================================================
+--- tests/404-handler.conf (.../tags/lighttpd-1.4.23)
++++ tests/404-handler.conf (.../branches/lighttpd-1.4.x)
+@@ -10,6 +10,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/lowercase.conf
+===================================================================
+--- tests/lowercase.conf (.../tags/lighttpd-1.4.23)
++++ tests/lowercase.conf (.../branches/lighttpd-1.4.x)
+@@ -6,6 +6,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
- compress.filetype = ("text/plain", "text/html")
+ server.force-lowercase-filenames = "enable"
-+ Keep in mind that compressed JavaScript and CSS files are broken in some
-+ browsers. Not setting any filetypes will result in no files being compressed.
-+
-+ NOTE: You have to specify the full mime-type! If you also define a charset, for example, you have to use "text/plain; charset=utf-8" instead of just "text/plain".
-+
- Default: not set
+Index: tests/condition.conf
+===================================================================
+--- tests/condition.conf (.../tags/lighttpd-1.4.23)
++++ tests/condition.conf (.../branches/lighttpd-1.4.x)
+@@ -10,6 +10,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/fastcgi-13.conf
+===================================================================
+--- tests/fastcgi-13.conf (.../tags/lighttpd-1.4.23)
++++ tests/fastcgi-13.conf (.../branches/lighttpd-1.4.x)
+@@ -10,6 +10,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
-+compress.max-filesize
-+ maximum size of the original file to be compressed kBytes.
+Index: tests/mod-compress.conf
+===================================================================
+--- tests/mod-compress.conf (.../tags/lighttpd-1.4.23)
++++ tests/mod-compress.conf (.../branches/lighttpd-1.4.x)
+@@ -11,6 +11,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+
+ server.modules = (
+Index: tests/lighttpd.conf
+===================================================================
+--- tests/lighttpd.conf (.../tags/lighttpd-1.4.23)
++++ tests/lighttpd.conf (.../branches/lighttpd-1.4.x)
+@@ -13,6 +13,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
+
+Index: tests/fastcgi-responder.conf
+===================================================================
+--- tests/fastcgi-responder.conf (.../tags/lighttpd-1.4.23)
++++ tests/fastcgi-responder.conf (.../branches/lighttpd-1.4.x)
+@@ -15,6 +15,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
-+ This is meant to protect the server against DoSing as compressing large
-+ (let's say 1Gbyte) takes a lot of time and would delay the whole operation
-+ of the server.
-+
-+ There is a hard upper limit of 128Mbyte.
-+
-+ Default: unlimited (== hard-limit of 128MByte)
-+
-+Display compressed files
-+========================
-+
-+If you enable mod_compress, and you want to force clients to uncompress and display compressed text files, please force mimetype to nothing.
-+Exemple :
-+If you want to add headers for uncompress and display diff.gz files , add this section in your conf : ::
-+
-+ $HTTP["url"] =~ "\.diff\.gz" {
-+ setenv.add-response-header = ( "Content-Encoding" => "gzip" )
-+ mimetype.assign = ()
-+ }
-+
-+
- Compressing Dynamic Content
- ===========================
+Index: tests/fastcgi-auth.conf
+===================================================================
+--- tests/fastcgi-auth.conf (.../tags/lighttpd-1.4.23)
++++ tests/fastcgi-auth.conf (.../branches/lighttpd-1.4.x)
+@@ -12,6 +12,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Apache 1.3.29"
-+PHP
-+---
-+
- To compress dynamic content with PHP please enable ::
+Index: tests/proxy.conf
+===================================================================
+--- tests/proxy.conf (.../tags/lighttpd-1.4.23)
++++ tests/proxy.conf (.../branches/lighttpd-1.4.x)
+@@ -6,6 +6,7 @@
+ ## bind to localhost (default: all interfaces)
+ server.bind = "localhost"
+ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
++server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+ server.name = "www.example.org"
+ server.tag = "Proxy"
+
+Index: tests/LightyTest.pm
+===================================================================
+--- tests/LightyTest.pm (.../tags/lighttpd-1.4.23)
++++ tests/LightyTest.pm (.../branches/lighttpd-1.4.x)
+@@ -87,14 +87,21 @@
+ my $self = shift;
+ my $port = shift;
+ my $child = shift;
++ my $timeout = 5*10; # 5 secs, select waits 0.1 s
+
+ while (0 == $self->listening_on($port)) {
+ select(undef, undef, undef, 0.1);
++ $timeout--;
+
+ # the process is gone, we failed
+ if (0 != waitpid($child, WNOHANG)) {
+ return -1;
+ }
++ if (0 >= $timeout) {
++ diag("Timeout while trying to connect; killing child");
++ kill('TERM', $child);
++ return -1;
++ }
+ }
- zlib.output_compression = 1
-+ zlib.output_handler = On
+ return 0;
+Index: configure.ac
+===================================================================
+Index: doc/.cvsignore
+===================================================================
+Index: doc/fastcgi.txt
+===================================================================
+--- doc/fastcgi.txt (.../tags/lighttpd-1.4.23)
++++ doc/fastcgi.txt (.../branches/lighttpd-1.4.x)
+@@ -95,23 +95,22 @@
+ (
+ ( "host" => <string> ,
+ "port" => <integer> ,
+- "socket" => <string>, # either socket
+- # or host+port
+- "bin-path" => <string>, # OPTIONAL
+- "bin-environment" => <array>, # OPTIONAL
+- "bin-copy-environment" => <array>, # OPTIONAL
++ "socket" => <string>, # either socket
++ # or host+port
++ "bin-path" => <string>, # OPTIONAL
++ "bin-environment" => <array>, # OPTIONAL
++ "bin-copy-environment" => <array>, # OPTIONAL
+ "mode" => <string>, # OPTIONAL
+ "docroot" => <string> , # OPTIONAL if "mode"
+- # is not "authorizer"
++ # is not "authorizer"
+ "check-local" => <string>, # OPTIONAL
+- "min-procs" => <integer>, # OPTIONAL
+- "max-procs" => <integer>, # OPTIONAL
+- "max-load-per-proc" => <integer>, # OPTIONAL
+- "idle-timeout" => <integer>, # OPTIONAL
+- "broken-scriptfilename" => <boolean>, # OPTIONAL
++ "max-procs" => <integer>, # OPTIONAL
++ "broken-scriptfilename" => <boolean>, # OPTIONAL
+ "disable-time" => <integer>, # optional
+- "allow-x-send-file" => <boolean> # optional
+- ),
++ "allow-x-send-file" => <boolean>, # optional
++ "kill-signal" => <integer>, # OPTIONAL
++ "fix-root-scriptname" => <boolean>,
++ # OPTIONAL
+ ( "host" => ...
+ )
+ )
+@@ -127,42 +126,38 @@
+ :"socket": path to the unix-domain socket
+ :"mode": is the FastCGI protocol mode.
+ Default is "responder", also "authorizer"
+- mode is implemented.
++ mode is implemented.
+ :"docroot": is optional and is the docroot on the remote
+ host for default "responder" mode. For
+- "authorizer" mode it is MANDATORY and it points
+- to docroot for authorized requests. For security
+- reasons it is recommended to keep this docroot
++ "authorizer" mode it is MANDATORY and it points
++ to docroot for authorized requests. For security
++ reasons it is recommended to keep this docroot
+ outside of server.document-root tree.
+ :"check-local": is optional and may be "enable" (default) or
+ "disable". If enabled the server first check
+- for a file in local server.document-root tree
+- and return 404 (Not Found) if no such file.
++ for a file in local server.document-root tree
++ and return 404 (Not Found) if no such file.
+ If disabled, the server forward request to
+- FastCGI interface without this check.
++ FastCGI interface without this check.
+ :"broken-scriptfilename": breaks SCRIPT_FILENAME in a wat that
+ PHP can extract PATH_INFO from it (default: disabled)
+ :"disable-time": time to wait before a disabled backend is checked
+ again
+ :"allow-x-send-file": controls if X-LIGHTTPD-send-file headers
+ are allowed
++ :"fix-root-scriptname": fix broken path-info split for "/" extension ("prefix")
+
+ If bin-path is set:
+
+- :"min-procs": sets the minium processes to start
+ :"max-procs": the upper limit of the processess to start
+- :"max-load-per-proc": maximum number of waiting processes on
+- average per process before a new process is
+- spawned
+- :"idle-timeout": number of seconds before a unused process
+- gets terminated
+ :"bin-environment": put an entry into the environment of
+ the started process
+ :"bin-copy-environement": clean up the environment and copy
+ only the specified entries into the fresh
+ environment of the spawn process
++ :"kill-signal": signal to terminate the FastCGI process with,
++ defauls to SIGTERM
- in the php.ini as PHP provides compression support by itself.
-+
-+mod_compress of lighttpd 1.5 r1992 may not set correct Content-Encoding with php-fcgi. A solution to that problem would be:
-+
-+1.disable mod_compress when request a php file::
-+
-+ $HTTP["url"] !~ "\.php$" {
-+ compress.filetype = ("text/plain", "text/html", "text/javascript", "text/css", "text/xml")
-+ }
-+
-+2.enable mod_setenv of your lighttpd::
-+
-+ server.modules += ( "mod_setenv" )
-+
-+3.manually set Content-Encoding::
-+
-+ $HTTP["url"] =~ "\.php$" {
-+ setenv.add-response-header = ( "Content-Encoding" => "gzip")
-+ }
-+
-+
-+TurboGears
-+----------
-+
-+To compress dynamic content with TurboGears please enable ::
-+
-+ [/]
-+ gzip_filter.on = True
-+ gzip_filter.mime_types = ["application/x-javascript", "text/javascript", "text/html", "text/css", "text/plain"]
-+
-+in the config/app.cfg file in your TurboGears application. The above lines should already be in the file. You just need to remove the comment symbol in front of the lines to make them active.
-+
-+Django
-+------
-+
-+To compress dynamic content with Django please enable the GZipMiddleware ::
-+
-+ MIDDLEWARE_CLASSES = (
-+ 'django.middleware.gzip.GZipMiddleware',
-+ ...
-+ )
-+
-+in the settings.py file in your Django project.
-+
-+Catalyst
-+--------
-+
-+To compress dynamic content with Perl/Catalyst, simply use the Catalyst::Plugin::Compress::Gzip module available on CPAN ::
-+
-+ use Catalyst qw(
-+ Compress::Gzip
-+ ...
-+ );
-+
-+in your main package (MyApp.pm). Further configuration is not required.
-+
-+}}}
-+
-+
-+
-Index: doc/configuration.txt
-===================================================================
---- doc/configuration.txt (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ doc/configuration.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -90,13 +90,21 @@
- $HTTP["host"]
- match on host
- $HTTP["useragent"]
-+$HTTP["user-agent"]
- match on useragent
- $HTTP["referer"]
- match on referer
-+$HTTP["method"]
-+ math on the http method
- $HTTP["url"]
- match on url
-+$HTTP["query-string"]
-+ match on the (not decoded) query-string
- $HTTP["remoteip"]
-+$HTTP["remote-ip"]
- match on the remote IP or a remote Network
-+$HTTP["language"]
-+ match on the Accept-Language header
- $SERVER["socket"]
- match on socket. Value must be on the format "ip:port" where ip is an IP
- address and port a port number. Only equal match (==) is supported.
-Index: doc/rewrite.txt
-===================================================================
---- doc/rewrite.txt (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ doc/rewrite.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -43,6 +43,12 @@
- The options ``url.rewrite`` and ``url.rewrite-final`` were mapped to ``url.rewrite-once``
- in 1.3.16.
-
-+Warning
-+=======
-+
-+Do NOT use mod_rewrite to protect specific urls, as the original url passed from the client
-+is matched against your rules, for example strings like "/abc/../xyz%2f/path".
-+
+-
Examples
- ========
+ --------
+
+@@ -171,11 +166,11 @@
+ fastcgi.server = ( ".php" =>
+ (( "host" => "127.0.0.1",
+ "port" => 1026,
+- "bin-path" => "/usr/local/bin/php"
++ "bin-path" => "/usr/local/bin/php"
+ )),
+ ".php4" =>
+ (( "host" => "127.0.0.1",
+- "port" => 1026
++ "port" => 1026
+ ))
+ )
+
+@@ -183,10 +178,10 @@
+
+ fastcgi.server = ( "/remote_scripts/" =>
+ (( "host" => "192.168.0.3",
+- "port" => 9000,
++ "port" => 9000,
+ "check-local" => "disable",
+ "docroot" => "/" # remote server may use
+- # it's own docroot
++ # it's own docroot
+ ))
+ )
+
+@@ -206,7 +201,7 @@
+
+ fastcgi.server = ( "/remote_scripts/" =>
+ (( "host" => "10.0.0.2",
+- "port" => 9000,
++ "port" => 9000,
+ "docroot" => "/path_to_private_docs",
+ "mode" => "authorizer"
+ ))
+@@ -318,10 +313,10 @@
+ $ PHP_FCGI_CHILDREN=384 ./lighttpd -f ./lighttpd.conf
+
+ fastcgi.server = ( ".php" =>
+- (( "socket" => "/tmp/php.socket",
++ (( "socket" => "/tmp/php.socket",
+ "bin-path" => "/usr/local/bin/php",
+ "min-procs" => 1,
+- "max-procs" => 1,
++ "max-procs" => 1,
+ "max-load-per-proc" => 4,
+ "idle-timeout" => 20
+ ))
+@@ -408,7 +403,7 @@
+ "PHP_FCGI_CHILDREN" => "16",
+ "PHP_FCGI_MAX_REQUESTS" => "10000" ),
+ "bin-copy-environment" => (
+- "PATH", "SHELL", "USER" )
++ "PATH", "SHELL", "USER" )
+ ))
+ )
Index: SConstruct
===================================================================
---- SConstruct (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ SConstruct (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -5,7 +5,7 @@
- from stat import *
-
- package = 'lighttpd'
--version = '1.4.20'
-+version = '1.4.21'
-
- def checkCHeaders(autoconf, hdrs):
- p = re.compile('[^A-Z0-9]')
Index: Makefile.am
===================================================================
---- Makefile.am (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ Makefile.am (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -1,4 +1,4 @@
--SUBDIRS=src doc tests cygwin openwrt
-+SUBDIRS=src doc tests
+--- Makefile.am (.../tags/lighttpd-1.4.23)
++++ Makefile.am (.../branches/lighttpd-1.4.x)
+@@ -2,4 +2,6 @@
EXTRA_DIST=autogen.sh SConstruct
++ACLOCAL_AMFLAGS = -I m4
++
+ distcleancheck_listfiles = find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
+Index: autogen.sh
+===================================================================
+--- autogen.sh (.../tags/lighttpd-1.4.23)
++++ autogen.sh (.../branches/lighttpd-1.4.x)
+@@ -1,27 +1,92 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
+
+-LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+ LIBTOOLIZE_FLAGS="--copy --force"
+-ACLOCAL=${ACLOCAL:-aclocal}
+-AUTOHEADER=${AUTOHEADER:-autoheader}
+-AUTOMAKE=${AUTOMAKE:-automake}
+-AUTOMAKE_FLAGS="--add-missing --copy"
+-AUTOCONF=${AUTOCONF:-autoconf}
++AUTOMAKE_FLAGS="--add-missing --copy --foreign"
+
+ ARGV0=$0
++ARGS="$@"
+
+-set -e
+
+-
+ run() {
+- echo "$ARGV0: running \`$@'"
+- $@
++ echo "$ARGV0: running \`$@' $ARGS"
++ $@ $ARGS
+ }
+
++## jump out if one of the programs returns 'false'
++set -e
++
++## on macosx glibtoolize, others have libtool
++if test x$LIBTOOLIZE = x; then
++ if test \! "x`which glibtoolize 2> /dev/null | grep -v '^no'`" = x; then
++ LIBTOOLIZE=glibtoolize
++ elif test \! "x`which libtoolize-1.5 2> /dev/null | grep -v '^no'`" = x; then
++ LIBTOOLIZE=libtoolize-1.5
++ elif test \! "x`which libtoolize 2> /dev/null | grep -v '^no'`" = x; then
++ LIBTOOLIZE=libtoolize
++ else
++ echo "libtoolize 1.5.x wasn't found, exiting"; exit 0
++ fi
++fi
++
++## suse has aclocal and aclocal-1.9
++if test x$ACLOCAL = x; then
++ if test \! "x`which aclocal-1.9 2> /dev/null | grep -v '^no'`" = x; then
++ ACLOCAL=aclocal-1.9
++ elif test \! "x`which aclocal19 2> /dev/null | grep -v '^no'`" = x; then
++ ACLOCAL=aclocal19
++ elif test \! "x`which aclocal 2> /dev/null | grep -v '^no'`" = x; then
++ ACLOCAL=aclocal
++ else
++ echo "automake 1.9.x (aclocal) wasn't found, exiting"; exit 0
++ fi
++fi
++
++if test x$AUTOMAKE = x; then
++ if test \! "x`which automake-1.9 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOMAKE=automake-1.9
++ elif test \! "x`which automake19 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOMAKE=automake19
++ elif test \! "x`which automake 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOMAKE=automake
++ else
++ echo "automake 1.9.x wasn't found, exiting"; exit 0
++ fi
++fi
++
++
++## macosx has autoconf-2.59 and autoconf-2.60
++if test x$AUTOCONF = x; then
++ if test \! "x`which autoconf-2.59 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOCONF=autoconf-2.59
++ elif test \! "x`which autoconf259 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOCONF=autoconf259
++ elif test \! "x`which autoconf 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOCONF=autoconf
++ else
++ echo "autoconf 2.59+ wasn't found, exiting"; exit 0
++ fi
++fi
++
++if test x$AUTOHEADER = x; then
++ if test \! "x`which autoheader-2.59 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOHEADER=autoheader-2.59
++ elif test \! "x`which autoheader259 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOHEADER=autoheader259
++ elif test \! "x`which autoheader 2> /dev/null | grep -v '^no'`" = x; then
++ AUTOHEADER=autoheader
++ else
++ echo "autoconf 2.59+ (autoheader) wasn't found, exiting"; exit 0
++ fi
++fi
++
++mkdir -p m4
+ run $LIBTOOLIZE $LIBTOOLIZE_FLAGS
+-run $ACLOCAL $ACLOCAL_FLAGS
++run $ACLOCAL $ACLOCAL_FLAGS -I m4
+ run $AUTOHEADER
+ run $AUTOMAKE $AUTOMAKE_FLAGS
+ run $AUTOCONF
+-echo "Now type './configure ...' and 'make' to compile."
++
++if test "$ARGS" = "" ; then
++ echo "Now type './configure ...' and 'make' to compile."
++fi
Index: NEWS
===================================================================
---- NEWS (.../tags/lighttpd-1.4.20) (revision 2392)
-+++ NEWS (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -3,8 +3,44 @@
+--- NEWS (.../tags/lighttpd-1.4.23)
++++ NEWS (.../branches/lighttpd-1.4.x)
+@@ -3,7 +3,42 @@
NEWS
====
--- 1.4.20 -
-+- 1.4.21 -
-
-+ * Fix base64 decoding in mod_auth (#1757, thx guido)
-+ * Fix mod_cgi segfault when bound to unix domain socket (#653)
-+ * Do not rely on ioctl FIONREAD (#673)
-+ * Now really fix mod auth ldap (#1066)
-+ * Fix leaving zombie process with include_shell (#1777)
-+ * Removed debian/, openwrt/ and cygwin/; they weren't kept up-to-date, and we decided to remove dist. specific stuff
-+ * Try to convert string options to shorts for numeric options in config file; allows to use env-vars for numeric options. (#1159, thx andrewb)
-+ * Do not cache default vhost in mod_simple_vhost (#709)
-+ * Trust pcre-config, do not check for pcre manually (#1769)
-+ * Fix fastcgi authorization in subdirectories with check-local=disabled; don't split pathinfo for authorizer. (#963)
-+ * Add possibility to disable methods in mod_compress (#1773)
-+ * Fix duplicate connection keep-alive/transfer-encoding headers (#960)
-+ * Fixed fix for round-robin in mod_proxy (forgot to increment the index) (#1715)
-+ * Fix fastcgi-authorizer handling; Status: 200 is now accepted as the doc requests
-+ * Compare address family in inet_ntop_cache
-+ * Revert CVE-2008-4359 (#1720) fix "encoding+simplifying urls for rewrite/redirect": too many regressions.
-+ * Use FD_CLOEXEC if possible (fixes #1821)
-+ * Optimized buffer usage in mod_proxy (fixes #1850)
-+ * Fix uninitialized value in time struct after strptime
-+ * Do not pass Proxy-Connection: header from client to backend http server in mod_proxy (#1877)
-+ * Fix wrong malloc sizes in mod_accesslog (probably nothing bad happened...) (fixes #1855, thx ycheng)
-+ * Some small buffer.c fixes (closes #1837)
-+ * Remove floating point math from server.c (fixes #1402)
-+ * Disable SSLv2 by default
-+ * Use/enforce sane max-connection values (fixes #1803)
-+ * Allow mod_compress to return 304 (Not Modified); compress ignores the static-file.etags option.(fixes #1884)
-+ * Add option to ignore the "Expect: 100-continue" header instead of returning 417 Expectation failed (closes #1017)
-+ * Use modified etags in mod_compress (fixes #1800)
-+ * Fix max-connection limit handling/100% cpu usage (fixes #1436)
-+ * Fix error handling in freebsd-sendfile (fixes #1813)
-+ * Silenced the annoying "request timed out" warning, enable with the "debug.log-timeouts" option (fixes #1529)
-+ * Allow tabs in header values (fixes #1822)
-+ * Added Language conditional (fixes #1119); patch by petar
-+
-+- 1.4.20 - 2008-09-30
-+
- * Fix mod_compress to compile with old gcc version (#1592)
- * Fix mod_extforward to compile with old gcc version (#1591)
- * Update documentation for #1587
-@@ -49,10 +85,10 @@
- * allow digits in [s]cgi env vars (#1712)
- * fixed dropping last character of evhost pattern (#161)
- * print helpful error message on conditionals in global block (#1550)
-- * decode url before matching in mod_rewrite (#1720)
-+ * decode url before matching in mod_rewrite (#1720) -- (reverted for 1.4.21)
- * fixed conditional patching of ldap filter (#1564)
-- * Match headers case insensitive in response (removing of X-{Sendfile,LIGHTTPD-*}, catching Date/Server)
-- * fixed bug with case-insensitive filenames in mod_userdir (#1589), spotted by "anders1"
-+ * Match headers case insensitive in response (removing of X-{Sendfile,LIGHTTPD-*}, catching Date/Server) [2281]
-+ * fixed bug with case-insensitive filenames in mod_userdir (#1589), spotted by "anders1" (CVE-2008-4360)
- * fixed format string bugs in mod_accesslog for SYSLOG
- * replaced fprintf with log_error_write in fastcgi debug
- * fixed mem leak in ssi expression parser (#1753), thx Take5k
-@@ -62,9 +98,9 @@
- * fix splitting of auth-ldap filter
- * workaround ldap connection leak if a ldap connection failed (restarting ldap)
- * fix auth.backend.ldap.bind-dn/pw problems (only read from global context for temporary ldap reconnects, thx ruskie)
-- * fix memleak in request header parsing (#1774, thx qhy)
-+ * fix memleak in request header parsing (#1774, thx qhy) (CVE-2008-4298)
- * fix mod_rewrite memleak/endless loop detection (#1775, thx phy - again!)
-- * use decoded url for matching in mod_redirect (#1720)
-+ * use decoded url for matching in mod_redirect (#1720) (CVE-2008-4359) -- (reverted for 1.4.21)
-
- - 1.4.19 - 2008-03-10
-
+-- 1.4.23 -
++- 1.4.24 -
++ * Add T_CONFIG_INT for bigger integers from the config (needed for #1966)
++ * Use unsigned int (and T_CONFIG_INT) for max_request_size
++ * Use unsigned int for secdownload.timeout (fixes #1966)
++ * Keep url/host values from connection to display information while keep-alive in mod_status (fixes #1202)
++ * Add server.breakagelog, a "special" stderr (fixes #1863)
++ * Fix config evaluation for debug.log-timeouts option (#1529)
++ * Add "cgi.execute-x-only" to mod_cgi, requires +x for cgi scripts (fixes #2013)
++ * Fix FD_SETSIZE comparision warnings
++ * Add "lua-5.1" to searched pkg-config names for lua
++ * Fix unused function webdav_lockdiscovery in mod_webdav
++ * cmake: Fix crypt lib check
++ * cmake: Add -export-dynamic to link flags, fixes build on FreeBSD
++ * Set FD_CLOEXEC for bound sockets before pipe-logger forks (fixes #2026)
++ * Reset ignored signals to SIG_DFL before exec() in fastcgi/scgi (fixes #2029)
++ * Show "no uri specified -> 400" error only when "debug.log-request-header-on-error" is enabled (fixes #2030)
++ * Fix hanging connection in mod_scgi (fixes #2024)
++ * Allow digits in hostnames in more places (fixes #1148)
++ * Use connection_reset instead of handle_request_done for cleanup callbacks
++ * Change mod_expire to append Cache-Control instead of overwriting it (fixes #1997)
++ * Allow all comparisons for $SERVER["socket"] - only bind for "=="
++ * Remove strptime failed message (fixes #2031)
++ * Fix issues found with clang analyzer
++ * Try to fix server.tag issue with localized svnversion
++ * Fix handling network-write return values (#2024)
++ * Use disable-time in fastcgi for all disables after errors, default is 1sec (fixes #2040)
++ * Remove adaptive spawning code from fastcgi (was disabled for a long time)
++ * Allow mod_mysql_vhost to use stored procedures (fixes #2011, thx Ben Brown)
++ * Fix ipv6 in mod_proxy (fixes #2043)
++ * Print errors from include_shell to stderr
++ * Set tm.tm_isdst = 0 before mktime() (fixes #2047)
++ * Use linux-epoll by default if available (fixes #2021, thx Olaf van der Spek)
++ * Print an error if you use too many captures in a regex pattern (fixes #2059)
++ * Combine Cache-Control header value in mod_expire to existing HTTP header if header already added by other modules (fixes #2068)
++
++- 1.4.23 - 2009-06-19
+ * Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)
+ * New lighttpd man page (moved it to section 8) (fixes #1875)
+ * Create rrd file for empty rrdfile in mod_rrdtool (#1788)
Index: CMakeLists.txt
===================================================================
---- CMakeLists.txt (.../tags/lighttpd-1.4.20) (revision 0)
-+++ CMakeLists.txt (.../branches/lighttpd-1.4.x) (revision 2392)
-@@ -0,0 +1,27 @@
-+PROJECT(lighttpd C)
-+
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0 FATAL_ERROR)
-+
-+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-+
-+INCLUDE(CTest)
-+
-+ENABLE_TESTING()
-+
-+SET(CPACK_PACKAGE_VERSION_MAJOR 1)
-+SET(CPACK_PACKAGE_VERSION_MINOR 4)
-+SET(CPACK_PACKAGE_VERSION_PATCH 21)
-+SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-+
-+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
-+SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
-+SET(CPACK_PACKAGE_VENDOR "jan@kneschke.de")
-+
-+SET(CPACK_SOURCE_GENERATOR "TGZ")
-+SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.;~$;/_;build/;CMakeFiles/;CMakeCache;gz$;Makefile\\\\.;trace;Testing/;foo;autom4te;cmake_install;CPack;\\\\.pem;ltmain.sh;configure;libtool;/config\\\\.;missing;autogen.sh;install-sh;Dart;aclocal;log$;Makefile$")
-+
-+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-+
-+ADD_SUBDIRECTORY(src build)
-+#ADD_SUBDIRECTORY(doc)
-+ADD_SUBDIRECTORY(tests)
-
-Property changes on: .
-___________________________________________________________________
-Modified: bzr:revision-info
- - timestamp: 2008-09-23 21:04:22.819999933 +0200
-committer: Stefan Bühler <stbuehler@web.de>
-properties:
- branch-nick: lighttpd-1.4.x
-
- + timestamp: 2009-02-05 23:27:05.799999952 +0100
-committer: Stefan Bühler <stbuehler@web.de>
-properties:
- branch-nick: lighttpd-1.4.x
-
-Modified: bzr:revision-id:v3-trunk0
- - 1127 stbuehler@web.de-20080728081644-j4cxnhduw8kbt8um
-1128 stbuehler@web.de-20080728084246-axvxdtjsrratxixs
-1129 stbuehler@web.de-20080729211700-s8v6nq2cu06qesls
-1130 stbuehler@web.de-20080729211726-4yxb6e5dva1cn0lz
-1131 stbuehler@web.de-20080729211750-4ulzigswx17uciyu
-1132 stbuehler@web.de-20080729211850-nliz3kd0m576ztuu
-1133 stbuehler@web.de-20080730163440-dg2y2sbf0u4grmn4
-1134 stbuehler@web.de-20080730173952-kiutzg6geqy7mick
-1135 stbuehler@web.de-20080730193616-9kc2ms7rrhv1lkn7
-1136 stbuehler@web.de-20080730211457-z4a6uth1y29glbqh
-1137 stbuehler@web.de-20080730213517-b6sjcrdwbmipl334
-1138 stbuehler@web.de-20080731102617-2xw8unjfqic7lsew
-1139 stbuehler@web.de-20080731102703-q4tu5a6em9y8xdg0
-1140 stbuehler@web.de-20080731102729-l6vn5b05w9swqbg5
-1141 stbuehler@web.de-20080731102756-oj3d4tnk0l90mj77
-1142 stbuehler@web.de-20080731204442-blw14cj2fkr3l8ly
-1143 stbuehler@web.de-20080731204508-imtfnurf922mg7tj
-1144 stbuehler@web.de-20080801112347-girnwswdkwm8wuip
-1145 stbuehler@web.de-20080801161245-kx1temr529o7xko9
-1146 stbuehler@web.de-20080801175332-oc9e7x8edn1owcc0
-1147 stbuehler@web.de-20080801183454-5i66v0gsdv0cgmia
-1148 stbuehler@web.de-20080801192849-6zklfbb832sx0hvr
-1149 stbuehler@web.de-20080801203119-o16elp8w854s6lol
-1150 stbuehler@web.de-20080802162146-a4v57svc788pwdsv
-1151 stbuehler@web.de-20080802162202-9udlc1wuwt09pyh2
-1152 stbuehler@web.de-20080804135803-yuor9ze06px7qta4
-1153 stbuehler@web.de-20080812194728-fupt781o6q058unh
-1154 stbuehler@web.de-20080818162116-piz0ukqsaecv2li2
-1155 stbuehler@web.de-20080818235700-94t0xc6ml70zojwq
-1156 stbuehler@web.de-20080819163650-1qhwsqszr78cr4xx
-1157 stbuehler@web.de-20080819163757-1qq3t1f1wj69t8xs
-1158 stbuehler@web.de-20080819163914-rklhkurg8apv85l2
-1159 stbuehler@web.de-20080819163953-tlqew751e43phf5b
-1160 stbuehler@web.de-20080819164108-8ogh68sm1uyteawe
-1161 stbuehler@web.de-20080819173911-w5bqpb7cp9jmdqye
-1162 stbuehler@web.de-20080819222242-c0ta5gnli9p3j35a
-1163 stbuehler@web.de-20080820100730-g1bwdh4nqb53ag9u
-1164 stbuehler@web.de-20080820100752-9pggugdyfnnps8qu
-1165 stbuehler@web.de-20080820164258-v2j00motsrsc5esp
-1166 stbuehler@web.de-20080827144628-hi9hf4ch3n1wf9ao
-1167 stbuehler@web.de-20080827144903-tfxu4yehlyu5kegc
-1168 stbuehler@web.de-20080827155155-7mt92orehbxkh2lh
-1169 stbuehler@web.de-20080917142048-zbcwpk39q9ewd516
-1170 stbuehler@web.de-20080917142300-16gzt21x4nbjtj87
-1171 stbuehler@web.de-20080919160134-385anjnd3txxdw3x
-1172 stbuehler@web.de-20080920134142-fvvwaw2ys51dg4rj
-1173 stbuehler@web.de-20080921153311-1f7rn01atdilmxmy
-1174 stbuehler@web.de-20080922101346-wel327kjmykkpvmp
-1175 stbuehler@web.de-20080923190422-uow06l38ndue36o4
-
- + 1127 stbuehler@web.de-20080728081644-j4cxnhduw8kbt8um
-1128 stbuehler@web.de-20080728084246-axvxdtjsrratxixs
-1129 stbuehler@web.de-20080729211700-s8v6nq2cu06qesls
-1130 stbuehler@web.de-20080729211726-4yxb6e5dva1cn0lz
-1131 stbuehler@web.de-20080729211750-4ulzigswx17uciyu
-1132 stbuehler@web.de-20080729211850-nliz3kd0m576ztuu
-1133 stbuehler@web.de-20080730163440-dg2y2sbf0u4grmn4
-1134 stbuehler@web.de-20080730173952-kiutzg6geqy7mick
-1135 stbuehler@web.de-20080730193616-9kc2ms7rrhv1lkn7
-1136 stbuehler@web.de-20080730211457-z4a6uth1y29glbqh
-1137 stbuehler@web.de-20080730213517-b6sjcrdwbmipl334
-1138 stbuehler@web.de-20080731102617-2xw8unjfqic7lsew
-1139 stbuehler@web.de-20080731102703-q4tu5a6em9y8xdg0
-1140 stbuehler@web.de-20080731102729-l6vn5b05w9swqbg5
-1141 stbuehler@web.de-20080731102756-oj3d4tnk0l90mj77
-1142 stbuehler@web.de-20080731204442-blw14cj2fkr3l8ly
-1143 stbuehler@web.de-20080731204508-imtfnurf922mg7tj
-1144 stbuehler@web.de-20080801112347-girnwswdkwm8wuip
-1145 stbuehler@web.de-20080801161245-kx1temr529o7xko9
-1146 stbuehler@web.de-20080801175332-oc9e7x8edn1owcc0
-1147 stbuehler@web.de-20080801183454-5i66v0gsdv0cgmia
-1148 stbuehler@web.de-20080801192849-6zklfbb832sx0hvr
-1149 stbuehler@web.de-20080801203119-o16elp8w854s6lol
-1150 stbuehler@web.de-20080802162146-a4v57svc788pwdsv
-1151 stbuehler@web.de-20080802162202-9udlc1wuwt09pyh2
-1152 stbuehler@web.de-20080804135803-yuor9ze06px7qta4
-1153 stbuehler@web.de-20080812194728-fupt781o6q058unh
-1154 stbuehler@web.de-20080818162116-piz0ukqsaecv2li2
-1155 stbuehler@web.de-20080818235700-94t0xc6ml70zojwq
-1156 stbuehler@web.de-20080819163650-1qhwsqszr78cr4xx
-1157 stbuehler@web.de-20080819163757-1qq3t1f1wj69t8xs
-1158 stbuehler@web.de-20080819163914-rklhkurg8apv85l2
-1159 stbuehler@web.de-20080819163953-tlqew751e43phf5b
-1160 stbuehler@web.de-20080819164108-8ogh68sm1uyteawe
-1161 stbuehler@web.de-20080819173911-w5bqpb7cp9jmdqye
-1162 stbuehler@web.de-20080819222242-c0ta5gnli9p3j35a
-1163 stbuehler@web.de-20080820100730-g1bwdh4nqb53ag9u
-1164 stbuehler@web.de-20080820100752-9pggugdyfnnps8qu
-1165 stbuehler@web.de-20080820164258-v2j00motsrsc5esp
-1166 stbuehler@web.de-20080827144628-hi9hf4ch3n1wf9ao
-1167 stbuehler@web.de-20080827144903-tfxu4yehlyu5kegc
-1168 stbuehler@web.de-20080827155155-7mt92orehbxkh2lh
-1169 stbuehler@web.de-20080917142048-zbcwpk39q9ewd516
-1170 stbuehler@web.de-20080917142300-16gzt21x4nbjtj87
-1171 stbuehler@web.de-20080919160134-385anjnd3txxdw3x
-1172 stbuehler@web.de-20080920134142-fvvwaw2ys51dg4rj
-1173 stbuehler@web.de-20080921153311-1f7rn01atdilmxmy
-1174 stbuehler@web.de-20080922101346-wel327kjmykkpvmp
-1175 stbuehler@web.de-20080923190422-uow06l38ndue36o4
-1176 stbuehler@web.de-20080930112012-53jby2m8xslmd1hm
-1177 stbuehler@web.de-20080930134824-j9q72rwuiczzof5k
-1178 stbuehler@web.de-20080930142037-32pb6m3zjcwryw1w
-1179 stbuehler@web.de-20080930142756-ueovgoshyb996bce
-1180 stbuehler@web.de-20080930152935-1zfy67brol3xdbc0
-1181 stbuehler@web.de-20080930193919-13n2q4c6fbgw0dkx
-1182 stbuehler@web.de-20080930211152-4hmgs95wyg2deol7
-1183 stbuehler@web.de-20081001132402-hxnyu6yzyk3mjf4d
-1184 stbuehler@web.de-20081001155102-qf0mmu2kkpgr7xf0
-1185 stbuehler@web.de-20081001160009-n67ss0vzlac2y60k
-1186 stbuehler@web.de-20081001200802-l5og517etnneitk0
-1188 stbuehler@web.de-20081004160711-ygaohrecmutiqlla
-1189 stbuehler@web.de-20081004211932-vq16u26mthbeed7d
-1191 stbuehler@web.de-20081005224446-1bztt6zqrjh8w8fd
-1192 stbuehler@web.de-20081012114652-ihgz590f0gl5gxpw
-1193 stbuehler@web.de-20081012114716-jnzljhexi4z2gh92
-1195 stbuehler@web.de-20081016120614-kz39vxtz1pebho0o
-1196 stbuehler@web.de-20081016121103-trug4hts0o62d1ut
-1197 stbuehler@web.de-20081016121114-65quosenmso8frf8
-1198 stbuehler@web.de-20081016121421-xjjb7fb53pxu6odj
-1199 stbuehler@web.de-20081205222033-6qok7y19pwp3kxm9
-1200 stbuehler@web.de-20081205222811-49izmzxui0y9ncq6
-1201 stbuehler@web.de-20081205233903-708beaujtf26gprx
-1202 stbuehler@web.de-20081207151631-yv9bdf94zw83jxpv
-1203 stbuehler@web.de-20081207151822-mhyg0gkedmttdqvd
-1204 stbuehler@web.de-20081207151835-1m3yta2fjc4pgb8y
-1205 stbuehler@web.de-20081218221139-w8los43bjbhy9urh
-1206 stbuehler@web.de-20081218222305-5wz7000a62iqa81r
-1208 stbuehler@web.de-20090203201352-ivan8lsb3nkv1go5
-1209 stbuehler@web.de-20090203204231-03zjmk7qiol9yxgq
-1210 stbuehler@web.de-20090203210157-bx1e59fqple5oj3v
-1211 stbuehler@web.de-20090203221006-qd6w80m7lmeqgrjh
-1212 stbuehler@web.de-20090203225303-3dwmialad2u720h8
-1213 stbuehler@web.de-20090204102521-jl3vo2ftp5rsbx9y
-1214 stbuehler@web.de-20090204151616-n56of74dydkqdkgh
-1215 stbuehler@web.de-20090204172956-6wzsv0nm5nxcgfym
-1216 stbuehler@web.de-20090205105134-6i5key9439wspueq
-1217 stbuehler@web.de-20090205114017-0voscqjd5bdm9mwv
-1218 stbuehler@web.de-20090205114442-peekxwpevjl3t7j3
-1219 stbuehler@web.de-20090205215425-vicbc6hzb3at7gj9
-1220 stbuehler@web.de-20090205220741-vqz9l1eui3dwnulq
-1221 stbuehler@web.de-20090205222705-8179v6jkv2x38l70
-
-
projects / packages / lighttpd.git / blobdiff