===================================================================
Index: src/configfile-glue.c
===================================================================
---- src/configfile-glue.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/configfile-glue.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
data_string *ds = (data_string *)du;
Index: src/mod_cgi.c
===================================================================
---- src/mod_cgi.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_cgi.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_cgi.c (.../tags/lighttpd-1.4.23)
++++ src/mod_cgi.c (.../branches/lighttpd-1.4.x)
@@ -56,6 +56,7 @@
typedef struct {
Index: src/network_write.c
===================================================================
---- src/network_write.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/network_write.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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
Index: src/mod_secure_download.c
===================================================================
---- src/mod_secure_download.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_secure_download.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
Index: src/base.h
===================================================================
---- src/base.h (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/base.h (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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,
fdevents *ev, *ev_ins;
Index: src/mod_rewrite.c
===================================================================
---- src/mod_rewrite.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_rewrite.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
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.23) (revision 2620)
-+++ src/connections.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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);
break;
Index: src/network.c
===================================================================
---- src/network.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/network.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/network.c (.../tags/lighttpd-1.4.23)
++++ src/network.c (.../branches/lighttpd-1.4.x)
@@ -90,6 +90,7 @@
srv_socket = calloc(1, sizeof(*srv_socket));
for (j = 0; j < srv->srv_sockets.used; j++) {
Index: src/configfile.c
===================================================================
---- src/configfile.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/configfile.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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 */
#endif
Index: src/mod_evhost.c
===================================================================
---- src/mod_evhost.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_evhost.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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();
if (ds->value->used) {
Index: src/splaytree.c
===================================================================
---- src/splaytree.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/splaytree.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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) {
for (;;) {
Index: src/lemon.c
===================================================================
---- src/lemon.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/lemon.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/lemon.c (.../tags/lighttpd-1.4.23)
++++ src/lemon.c (.../branches/lighttpd-1.4.x)
@@ -39,6 +39,12 @@
# endif
#endif
int maxdtlength; /* Maximum length of any ".datatype" field. */
Index: src/mod_scgi.c
===================================================================
---- src/mod_scgi.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_scgi.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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);
Index: src/mod_mysql_vhost.c
===================================================================
---- src/mod_mysql_vhost.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_mysql_vhost.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_mysql_vhost.c (.../tags/lighttpd-1.4.23)
++++ src/mod_mysql_vhost.c (.../branches/lighttpd-1.4.x)
@@ -259,8 +259,14 @@
#define FOO(x) (s->x->used ? s->x->ptr : NULL)
}
Index: src/request.c
===================================================================
---- src/request.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/request.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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 */
con->request.request);
Index: src/network_backends.h
===================================================================
---- src/network_backends.h (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/network_backends.h (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/network_backends.h (.../tags/lighttpd-1.4.23)
++++ src/network_backends.h (.../branches/lighttpd-1.4.x)
@@ -45,6 +45,11 @@
#include "base.h"
int network_write_chunkqueue_writev(server *srv, connection *con, int fd, chunkqueue *cq);
Index: src/mod_rrdtool.c
===================================================================
---- src/mod_rrdtool.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_rrdtool.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_rrdtool.c (.../tags/lighttpd-1.4.23)
++++ src/mod_rrdtool.c (.../branches/lighttpd-1.4.x)
@@ -139,10 +139,8 @@
args[i++] = p->conf.path_rrdtool_bin->ptr;
Index: src/stat_cache.c
===================================================================
---- src/stat_cache.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/stat_cache.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/stat_cache.c (.../tags/lighttpd-1.4.23)
++++ src/stat_cache.c (.../branches/lighttpd-1.4.x)
@@ -503,12 +503,10 @@
}
sce = stat_cache_entry_init();
buffer_copy_string_buffer(sce->name, name);
+Index: src/response.h
+===================================================================
+--- src/response.h (.../tags/lighttpd-1.4.23)
++++ src/response.h (.../branches/lighttpd-1.4.x)
+@@ -10,6 +10,7 @@
+
+ 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);
+
+ 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) (revision 2620)
-+++ src/mod_proxy.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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) {
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/Makefile.am (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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; \
echo "#define REPO_VERSION \"-devel-$$REVISION\"" > versionstamp.h.tmp; \
Index: src/mod_expire.c
===================================================================
---- src/mod_expire.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_expire.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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 */
- response_header_overwrite(srv, con, CONST_STR_LEN("Cache-Control"), CONST_BUF_LEN(p->expire_tstmp));
-+ response_header_insert(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));
return HANDLER_GO_ON;
}
Index: src/http_auth.c
===================================================================
---- src/http_auth.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/http_auth.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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];
log_error_write(srv, __FILE__, __LINE__, "s",
Index: src/mod_redirect.c
===================================================================
---- src/mod_redirect.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_redirect.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_redirect.c (.../tags/lighttpd-1.4.23)
++++ src/mod_redirect.c (.../branches/lighttpd-1.4.x)
@@ -203,7 +203,7 @@
}
} else {
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) (revision 2620)
-+++ src/mod_webdav.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_webdav.c (.../tags/lighttpd-1.4.23)
++++ src/mod_webdav.c (.../branches/lighttpd-1.4.x)
@@ -1096,6 +1096,7 @@
}
#endif
*
Index: src/configparser.y
===================================================================
---- src/configparser.y (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/configparser.y (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
}
Index: src/mod_status.c
===================================================================
---- src/mod_status.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_status.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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(
/* we have nothing to send */
Index: src/mod_ssi.c
===================================================================
---- src/mod_ssi.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_ssi.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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: {
"ssi: unknow attribute for ",
Index: src/mod_auth.c
===================================================================
---- src/mod_auth.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_auth.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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) {
}
Index: src/mod_cml_lua.c
===================================================================
---- src/mod_cml_lua.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_cml_lua.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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 "mod_cml_funcs.h"
Index: src/http-header-glue.c
===================================================================
---- src/http-header-glue.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/http-header-glue.c (.../branches/lighttpd-1.4.x) (revision 2620)
-@@ -259,7 +259,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)) {
return HANDLER_FINISHED;
} else {
char buf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
-@@ -281,15 +281,16 @@
+@@ -281,15 +296,16 @@
strncpy(buf, con->request.http_if_modified_since, used_len);
buf[used_len] = '\0';
t_file = mktime(&tm);
if (t_file > t_header) return HANDLER_GO_ON;
-@@ -318,7 +319,7 @@
+@@ -318,7 +334,7 @@
}
if (0 == strncmp(con->request.http_if_modified_since, mtime->ptr, used_len)) {
return HANDLER_FINISHED;
} else {
char buf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
-@@ -331,18 +332,17 @@
+@@ -331,18 +347,17 @@
strncpy(buf, con->request.http_if_modified_since, used_len);
buf[used_len] = '\0';
if (t_file > t_header) return HANDLER_GO_ON;
Index: src/mod_setenv.c
===================================================================
---- src/mod_setenv.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_setenv.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
}
Index: src/mod_fastcgi.c
===================================================================
---- src/mod_fastcgi.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_fastcgi.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_fastcgi.c (.../tags/lighttpd-1.4.23)
++++ src/mod_fastcgi.c (.../branches/lighttpd-1.4.x)
@@ -122,24 +122,11 @@
*
*/
Index: src/fdevent_poll.c
===================================================================
---- src/fdevent_poll.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/fdevent_poll.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
static int fdevent_poll_event_get_fd(fdevents *ev, size_t ndx) {
Index: src/fdevent_select.c
===================================================================
---- src/fdevent_select.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/fdevent_select.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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);
===================================================================
Index: src/server.c
===================================================================
---- src/server.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/server.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/server.c (.../tags/lighttpd-1.4.23)
++++ src/server.c (.../branches/lighttpd-1.4.x)
@@ -187,6 +187,7 @@
CLEAN(cond_check_buf);
"if event-handler is 'select'. Use 'poll' or something else or reduce server.max-fds.");
Index: src/mod_dirlisting.c
===================================================================
---- src/mod_dirlisting.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_dirlisting.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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 (du->type != TYPE_ARRAY) {
Index: src/mod_magnet.c
===================================================================
---- src/mod_magnet.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/mod_magnet.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/mod_magnet.c (.../tags/lighttpd-1.4.23)
++++ src/mod_magnet.c (.../branches/lighttpd-1.4.x)
@@ -283,17 +283,11 @@
}
con = lua_touserdata(L, -1);
Index: src/log.c
===================================================================
---- src/log.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/log.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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 */
break;
Index: src/proc_open.c
===================================================================
---- src/proc_open.c (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ src/proc_open.c (.../branches/lighttpd-1.4.x) (revision 2620)
+--- src/proc_open.c (.../tags/lighttpd-1.4.23)
++++ src/proc_open.c (.../branches/lighttpd-1.4.x)
@@ -309,6 +309,14 @@
if (err) {
===================================================================
Index: tests/bug-12.conf
===================================================================
---- tests/bug-12.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/bug-12.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/fastcgi-10.conf
===================================================================
---- tests/fastcgi-10.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/fastcgi-10.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/bug-06.conf
===================================================================
---- tests/bug-06.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/bug-06.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
===================================================================
Index: tests/var-include.conf
===================================================================
---- tests/var-include.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/var-include.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/404-handler.conf
===================================================================
---- tests/404-handler.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/404-handler.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/lowercase.conf
===================================================================
---- tests/lowercase.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/lowercase.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/condition.conf
===================================================================
---- tests/condition.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/condition.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/fastcgi-13.conf
===================================================================
---- tests/fastcgi-13.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/fastcgi-13.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/mod-compress.conf
===================================================================
---- tests/mod-compress.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/mod-compress.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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.modules = (
Index: tests/lighttpd.conf
===================================================================
---- tests/lighttpd.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/lighttpd.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/fastcgi-responder.conf
===================================================================
---- tests/fastcgi-responder.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/fastcgi-responder.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/fastcgi-auth.conf
===================================================================
---- tests/fastcgi-auth.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/fastcgi-auth.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/proxy.conf
===================================================================
---- tests/proxy.conf (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/proxy.conf (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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"
Index: tests/LightyTest.pm
===================================================================
---- tests/LightyTest.pm (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ tests/LightyTest.pm (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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;
return 0;
Index: configure.ac
===================================================================
---- configure.ac (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ configure.ac (.../branches/lighttpd-1.4.x) (revision 2620)
-@@ -1,9 +1,10 @@
- # -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.57)
--AC_INIT([lighttpd], [1.4.23], [contact@lighttpd.net])
-+AC_INIT([lighttpd], [1.4.24], [contact@lighttpd.net])
- AC_CONFIG_SRCDIR([src/server.c])
- AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
-
- AC_CANONICAL_TARGET
-
-@@ -417,12 +418,18 @@
- AC_DEFINE([HAVE_LUA], [1], [liblua])
- AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
- ],[
-- # for debian based systems
-- PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
-- AC_DEFINE([HAVE_LUA], [1], [liblua])
-- AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-- ])
-+ # for debian based systems
-+ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
-+ AC_DEFINE([HAVE_LUA], [1], [liblua])
-+ AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-+ ],[
-+ # for freebsd
-+ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [
-+ AC_DEFINE([HAVE_LUA], [1], [liblua])
-+ AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
- ])
-+ ])
-+ ])
-
- AC_SUBST(LUA_CFLAGS)
- AC_SUBST(LUA_LIBS)
Index: doc/.cvsignore
===================================================================
Index: doc/fastcgi.txt
===================================================================
---- doc/fastcgi.txt (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ doc/fastcgi.txt (.../branches/lighttpd-1.4.x) (revision 2620)
+--- doc/fastcgi.txt (.../tags/lighttpd-1.4.23)
++++ doc/fastcgi.txt (.../branches/lighttpd-1.4.x)
@@ -95,23 +95,22 @@
(
( "host" => <string> ,
===================================================================
Index: Makefile.am
===================================================================
---- Makefile.am (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ Makefile.am (.../branches/lighttpd-1.4.x) (revision 2620)
+--- Makefile.am (.../tags/lighttpd-1.4.23)
++++ Makefile.am (.../branches/lighttpd-1.4.x)
@@ -2,4 +2,6 @@
EXTRA_DIST=autogen.sh SConstruct
distcleancheck_listfiles = find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
Index: autogen.sh
===================================================================
---- autogen.sh (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ autogen.sh (.../branches/lighttpd-1.4.x) (revision 2620)
+--- 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.
+fi
Index: NEWS
===================================================================
---- NEWS (.../tags/lighttpd-1.4.23) (revision 2620)
-+++ NEWS (.../branches/lighttpd-1.4.x) (revision 2620)
-@@ -3,7 +3,41 @@
+--- NEWS (.../tags/lighttpd-1.4.23)
++++ NEWS (.../branches/lighttpd-1.4.x)
+@@ -3,7 +3,42 @@
NEWS
====
+ * 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)