[pkg-lighttpd] r460 - in lighttpd/trunk: . debian src
Olaf van der Spek
olafvdspek-guest at alioth.debian.org
Wed Jun 2 13:07:24 UTC 2010
Author: olafvdspek-guest
Date: 2010-06-02 13:07:07 +0000 (Wed, 02 Jun 2010)
New Revision: 460
Modified:
lighttpd/trunk/NEWS
lighttpd/trunk/SConstruct
lighttpd/trunk/configure
lighttpd/trunk/configure.ac
lighttpd/trunk/debian/changelog
lighttpd/trunk/src/Makefile.am
lighttpd/trunk/src/Makefile.in
lighttpd/trunk/src/connections.c
lighttpd/trunk/src/mod_compress.c
lighttpd/trunk/src/mod_proxy.c
lighttpd/trunk/src/network.c
lighttpd/trunk/src/response.c
Log:
Upstream 1.4.27rc1-r2724
Modified: lighttpd/trunk/NEWS
===================================================================
--- lighttpd/trunk/NEWS 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/NEWS 2010-06-02 13:07:07 UTC (rev 460)
@@ -3,7 +3,16 @@
NEWS
====
-- 1.4.26 -
+- 1.4.27 -
+ * Fix handling return value of SSL_CTX_set_options (fixes #2157, thx mlcreech)
+ * Fix mod_proxy HUP handling (send final chunk, fix usage counter)
+ * mod_proxy: close connection on write error (fixes #2114)
+ * Check uri instead of physical path for directory redirect
+ * Fix detecting git repository (fixes #2173, thx ncopa)
+ * [mod_compress] Fix segfault when etags are disabled (fixes #2169)
+ * Reset uri.authority before TLS servername handling, reset all "keep-alive" data in connection_del (fixes #2125)
+
+- 1.4.26 - 2010-02-07
* Fix request parser to handle packets with splitted \r\n\r\n (fixes #2105)
* Remove dependency on automake >= 1.11 with m4_ifdef check
* mod_accesslog: support %e (fixes #2113, thx presbrey)
Modified: lighttpd/trunk/SConstruct
===================================================================
--- lighttpd/trunk/SConstruct 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/SConstruct 2010-06-02 13:07:07 UTC (rev 460)
@@ -5,7 +5,7 @@
from stat import *
package = 'lighttpd'
-version = '1.4.26'
+version = '1.4.27'
def checkCHeaders(autoconf, hdrs):
p = re.compile('[^A-Z0-9]')
Modified: lighttpd/trunk/configure
===================================================================
--- lighttpd/trunk/configure 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/configure 2010-06-02 13:07:07 UTC (rev 460)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for lighttpd 1.4.26.
+# Generated by GNU Autoconf 2.65 for lighttpd 1.4.27.
#
# Report bugs to <contact at lighttpd.net>.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='lighttpd'
PACKAGE_TARNAME='lighttpd'
-PACKAGE_VERSION='1.4.26'
-PACKAGE_STRING='lighttpd 1.4.26'
+PACKAGE_VERSION='1.4.27'
+PACKAGE_STRING='lighttpd 1.4.27'
PACKAGE_BUGREPORT='contact at lighttpd.net'
PACKAGE_URL=''
@@ -1483,7 +1483,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lighttpd 1.4.26 to adapt to many kinds of systems.
+\`configure' configures lighttpd 1.4.27 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1554,7 +1554,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lighttpd 1.4.26:";;
+ short | recursive ) echo "Configuration of lighttpd 1.4.27:";;
esac
cat <<\_ACEOF
@@ -1687,7 +1687,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lighttpd configure 1.4.26
+lighttpd configure 1.4.27
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2347,7 +2347,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lighttpd $as_me 1.4.26, which was
+It was created by lighttpd $as_me 1.4.27, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3271,7 +3271,7 @@
# Define the identity of the package.
PACKAGE='lighttpd'
- VERSION='1.4.26'
+ VERSION='1.4.27'
cat >>confdefs.h <<_ACEOF
@@ -15580,7 +15580,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lighttpd $as_me 1.4.26, which was
+This file was extended by lighttpd $as_me 1.4.27, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15646,7 +15646,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-lighttpd config.status 1.4.26
+lighttpd config.status 1.4.27
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
Modified: lighttpd/trunk/configure.ac
===================================================================
--- lighttpd/trunk/configure.ac 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/configure.ac 2010-06-02 13:07:07 UTC (rev 460)
@@ -1,7 +1,7 @@
dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([lighttpd], [1.4.26], [contact at lighttpd.net])
+AC_INIT([lighttpd], [1.4.27], [contact at lighttpd.net])
AC_CONFIG_SRCDIR([src/server.c])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/debian/changelog 2010-06-02 13:07:07 UTC (rev 460)
@@ -1,3 +1,9 @@
+lighttpd (1.4.27~rc1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Olaf van der Spek <olaf at router> Wed, 02 Jun 2010 15:03:11 +0200
+
lighttpd (1.4.26-3) UNRELEASED; urgency=low
* NOT RELEASED YET
Modified: lighttpd/trunk/src/Makefile.am
===================================================================
--- lighttpd/trunk/src/Makefile.am 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/Makefile.am 2010-06-02 13:07:07 UTC (rev 460)
@@ -19,7 +19,7 @@
REVISION=""; \
fi; \
fi; \
- if test -z "$$REVISION" -a -x "`which git`"; then \
+ if test -z "$$REVISION" -a -d "$(top_srcdir)/.git" -a -x "`which git`"; then \
REVISION="$$(cd "$(top_srcdir)"; LANG= LC_ALL=C git describe --always 2>/dev/null || echo)"; \
fi; \
if test -n "$$REVISION"; then \
Modified: lighttpd/trunk/src/Makefile.in
===================================================================
--- lighttpd/trunk/src/Makefile.in 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/Makefile.in 2010-06-02 13:07:07 UTC (rev 460)
@@ -1795,7 +1795,7 @@
REVISION=""; \
fi; \
fi; \
- if test -z "$$REVISION" -a -x "`which git`"; then \
+ if test -z "$$REVISION" -a -d "$(top_srcdir)/.git" -a -x "`which git`"; then \
REVISION="$$(cd "$(top_srcdir)"; LANG= LC_ALL=C git describe --always 2>/dev/null || echo)"; \
fi; \
if test -n "$$REVISION"; then \
Modified: lighttpd/trunk/src/connections.c
===================================================================
--- lighttpd/trunk/src/connections.c 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/connections.c 2010-06-02 13:07:07 UTC (rev 460)
@@ -82,6 +82,11 @@
if (-1 == con->ndx) return -1;
+ buffer_reset(con->uri.authority);
+ buffer_reset(con->uri.path);
+ buffer_reset(con->uri.query);
+ buffer_reset(con->request.orig_uri);
+
i = con->ndx;
/* not last element */
Modified: lighttpd/trunk/src/mod_compress.c
===================================================================
--- lighttpd/trunk/src/mod_compress.c 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/mod_compress.c 2010-06-02 13:07:07 UTC (rev 460)
@@ -744,6 +744,7 @@
int accept_encoding = 0;
char *value = ds->value->ptr;
int matched_encodings = 0;
+ int use_etag = sce->etag != NULL && sce->etag->ptr != NULL;
/* get client side support encodings */
#ifdef USE_ZLIB
@@ -770,12 +771,14 @@
mtime = strftime_cache_get(srv, sce->st.st_mtime);
/* 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;
+ if (use_etag) {
+ 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;
+ }
}
/* select best matching encoding */
@@ -790,22 +793,26 @@
compression_name = dflt_deflate;
}
- /* 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);
+ if (use_etag) {
+ /* 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);
+ }
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));
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));
+ if (use_etag) {
+ response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
+ }
return HANDLER_FINISHED;
}
/* deflate it */
- if (p->conf.compress_cache_dir->used) {
+ if (use_etag && 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 {
@@ -814,7 +821,9 @@
}
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));
+ if (use_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));
/* let mod_staticfile handle the cached compressed files, physical path was modified */
return p->conf.compress_cache_dir->used ? HANDLER_GO_ON : HANDLER_FINISHED;
Modified: lighttpd/trunk/src/mod_proxy.c
===================================================================
--- lighttpd/trunk/src/mod_proxy.c 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/mod_proxy.c 2010-06-02 13:07:07 UTC (rev 460)
@@ -349,6 +349,10 @@
srv->cur_fds--;
}
+ if (hctx->host) {
+ hctx->host->usage--;
+ }
+
handler_ctx_free(hctx);
con->plugin_ctx[p->id] = NULL;
}
@@ -848,11 +852,11 @@
if (-1 == ret) { /* error on our side */
log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed:", strerror(errno), errno);
- return HANDLER_WAIT_FOR_EVENT;
+ return HANDLER_ERROR;
} 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_ERROR;
}
if (hctx->wb->bytes_out == hctx->wb->bytes_in) {
@@ -989,8 +993,6 @@
case 0:
break;
case 1:
- hctx->host->usage--;
-
/* we are done */
proxy_connection_close(srv, hctx);
@@ -1077,8 +1079,11 @@
return HANDLER_FINISHED;
}
+ if (!con->file_finished) {
+ http_chunk_append_mem(srv, con, NULL, 0);
+ }
+
con->file_finished = 1;
-
proxy_connection_close(srv, hctx);
joblist_append(srv, con);
} else if (revents & FDEVENT_ERR) {
@@ -1086,6 +1091,7 @@
log_error_write(srv, __FILE__, __LINE__, "sd", "proxy-FDEVENT_ERR, but no HUP", revents);
+ con->file_finished = 1;
joblist_append(srv, con);
proxy_connection_close(srv, hctx);
}
Modified: lighttpd/trunk/src/network.c
===================================================================
--- lighttpd/trunk/src/network.c 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/network.c 2010-06-02 13:07:07 UTC (rev 460)
@@ -82,6 +82,9 @@
buffer_copy_string(con->tlsext_server_name, servername);
buffer_to_lower(con->tlsext_server_name);
+ /* Sometimes this is still set, confusing COMP_HTTP_HOST */
+ buffer_reset(con->uri.authority);
+
config_cond_cache_reset(srv, con);
config_setup_connection(srv, con);
@@ -525,7 +528,7 @@
if (!s->ssl_use_sslv2) {
/* disable SSLv2 */
- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
+ 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;
Modified: lighttpd/trunk/src/response.c
===================================================================
--- lighttpd/trunk/src/response.c 2010-06-02 13:02:42 UTC (rev 459)
+++ lighttpd/trunk/src/response.c 2010-06-02 13:07:07 UTC (rev 460)
@@ -136,6 +136,8 @@
X509 *xs;
X509_NAME *xn;
X509_NAME_ENTRY *xe;
+ int i, nentries;
+
if (
SSL_get_verify_result(con->ssl) != X509_V_OK
|| !(xs = SSL_get_peer_certificate(con->ssl))
@@ -144,7 +146,7 @@
}
xn = X509_get_subject_name(xs);
- for (int i = 0, nentries = X509_NAME_entry_count(xn); i < nentries; ++i) {
+ for (i = 0, nentries = X509_NAME_entry_count(xn); i < nentries; ++i) {
int xobjnid;
const char * xobjsn;
data_string *envds;
@@ -581,7 +583,7 @@
};
#endif
if (S_ISDIR(sce->st.st_mode)) {
- if (con->physical.path->ptr[con->physical.path->used - 2] != '/') {
+ if (con->uri.path->ptr[con->uri.path->used - 2] != '/') {
/* redirect to .../ */
http_response_redirect_to_directory(srv, con);
More information about the pkg-lighttpd-maintainers
mailing list