7 files changed, 3 insertions, 238 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 938bbaac865c..a63e86bf8f8f 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	lighttpd
-PORTVERSION=	1.4.30
-PORTREVISION=	3
+PORTVERSION=	1.4.31
 CATEGORIES?=	www
 MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index b2ee3d77f3ab..26b2d4d3abf5 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,5 +1,5 @@
-SHA256 (lighttpd-1.4.30.tar.bz2) = 0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d
-SIZE (lighttpd-1.4.30.tar.bz2) = 664697
+SHA256 (lighttpd-1.4.31.tar.bz2) = 5209e7a25d3044cb21b34d6a2bb3a6f6c216ba903ea486a803d070582e5e26ac
+SIZE (lighttpd-1.4.31.tar.bz2) = 675275
 SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = d7c3704d5253c4f3c18459f89059063b311e50096cd2c38fc982cec683c32e61
 SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = 44695
 SHA256 (lighttpd-1.4.26_mod_geoip.patch.gz) = db43cc0ed7c808b5eed3185d97346e70dea0f1ef4fa9ed436d08e4faff7f97e7
diff --git a/www/lighttpd/files/patch-src-mod_extforward.c b/www/lighttpd/files/patch-src-mod_extforward.c
deleted file mode 100644
index 398f53fbdc0a..000000000000
--- a/www/lighttpd/files/patch-src-mod_extforward.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/mod_extforward.c.orig	2010-02-19 11:34:37.000000000 +0100
-+++ src/mod_extforward.c	2010-02-19 11:40:02.000000000 +0100
-@@ -240,14 +240,14 @@ static array *extract_forward_array(buff
- 		int in_str = 0;
- 		for (base = pbuffer->ptr, curr = pbuffer->ptr; *curr; curr++) {
- 			if (in_str) {
--				if ((*curr > '9' || *curr < '0') && *curr != '.' && *curr != ':') {
-+				if ((*curr < '0' || *curr > '9') && *curr != '.' && *curr != ':' && (*curr < 'a' || *curr > 'f') && (*curr < 'A' || *curr > 'F')) {
- 					/* found an separator , insert value into result array */
- 					put_string_into_array_len(result, base, curr - base);
- 					/* change state to not in string */
- 					in_str = 0;
- 				}
- 			} else {
--				if (*curr >= '0' && *curr <= '9') {
-+				if ((*curr >= '0' && *curr <= '9') || (*curr >= 'a' && *curr <= 'f') || (*curr >= 'A' && *curr <= 'F')) {
- 					/* found leading char of an IP address, move base pointer and change state */
- 					base = curr;
- 					in_str = 1;
diff --git a/www/lighttpd/files/patch-svn-2822 b/www/lighttpd/files/patch-svn-2822
deleted file mode 100644
index 97f25856c51f..000000000000
--- a/www/lighttpd/files/patch-svn-2822
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/connections.c
-===================================================================
---- src/connections.c	(revision 2821)
-+++ src/connections.c	(revision 2822)
-@@ -1360,9 +1360,7 @@
- 			}
- 
- 			con->renegotiations = 0;
--#ifndef OPENSSL_NO_TLSEXT
- 			SSL_set_app_data(con->ssl, con);
--#endif
- 			SSL_set_accept_state(con->ssl);
- 			con->conf.is_ssl=1;
- 
diff --git a/www/lighttpd/files/patch-svn-2824 b/www/lighttpd/files/patch-svn-2824
deleted file mode 100644
index cb91bfff392f..000000000000
--- a/www/lighttpd/files/patch-svn-2824
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: src/server.c
-===================================================================
---- src/server.c	(revision 2823)
-+++ src/server.c	(revision 2824)
-@@ -409,19 +409,31 @@
-       "\t- libev (generic)\n"
- #endif
-       "\nNetwork handler:\n\n"
--#if defined(USE_LINUX_SENDFILE) || defined(USE_FREEBSD_SENDFILE) || defined(USE_SOLARIS_SENDFILEV) || defined(USE_AIX_SENDFILE)
--      "\t+ sendfile\n"
-+#if defined USE_LINUX_SENDFILE
-+      "\t+ linux-sendfile\n"
- #else
--  #ifdef USE_WRITEV
-+      "\t- linux-sendfile\n"
-+#endif
-+#if defined USE_FREEBSD_SENDFILE
-+      "\t+ freebsd-sendfile\n"
-+#else
-+      "\t- freebsd-sendfile\n"
-+#endif
-+#if defined USE_SOLARIS_SENDFILEV
-+      "\t+ solaris-sendfilev\n"
-+#else
-+      "\t- solaris-sendfilev\n"
-+#endif
-+#if defined USE_WRITEV
-       "\t+ writev\n"
--  #else
-+#else
-+      "\t- writev\n"
-+#endif
-       "\t+ write\n"
--  #endif
--  #ifdef USE_MMAP
-+#ifdef USE_MMAP
-       "\t+ mmap support\n"
--  #else
-+#else
-       "\t- mmap support\n"
--  #endif
- #endif
-       "\nFeatures:\n\n"
- #ifdef HAVE_IPV6
diff --git a/www/lighttpd/files/patch-svn-2825 b/www/lighttpd/files/patch-svn-2825
deleted file mode 100644
index 71e2fe443d32..000000000000
--- a/www/lighttpd/files/patch-svn-2825
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: src/network.c
-===================================================================
---- src/network.c	(revision 2824)
-+++ src/network.c	(revision 2825)
-@@ -25,6 +25,14 @@
- # include <openssl/ssl.h>
- # include <openssl/err.h>
- # include <openssl/rand.h>
-+# include <openssl/dh.h>
-+# include <openssl/bn.h>
-+
-+# if OPENSSL_VERSION_NUMBER >= 0x0090800fL
-+#  ifndef OPENSSL_NO_ECDH
-+# include <openssl/ecdh.h>
-+#  endif
-+# endif
- #endif
- 
- #ifdef USE_OPENSSL
diff --git a/www/lighttpd/files/patch-svn-2826-2827 b/www/lighttpd/files/patch-svn-2826-2827
deleted file mode 100644
index e5ce5e0a8f83..000000000000
--- a/www/lighttpd/files/patch-svn-2826-2827
+++ /dev/null
@@ -1,138 +0,0 @@
-Index: src/network_backends.h
-===================================================================
---- src/network_backends.h	(revision 2825)
-+++ src/network_backends.h	(revision 2827)
-@@ -31,7 +31,7 @@
- # include <sys/uio.h>
- #endif
- 
--#if defined HAVE_SYS_MMAN_H && defined HAVE_MMAP
-+#if defined HAVE_SYS_MMAN_H && defined HAVE_MMAP && defined ENABLE_MMAP
- # define USE_MMAP
- # include <sys/mman.h>
- /* NetBSD 1.3.x needs it */
-Index: src/mod_compress.c
-===================================================================
---- src/mod_compress.c	(revision 2825)
-+++ src/mod_compress.c	(revision 2827)
-@@ -485,7 +485,7 @@
- 		return -1;
- 	}
- 
--
-+#ifdef USE_MMAP
- 	if (MAP_FAILED == (start = mmap(NULL, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0))) {
- 		log_error_write(srv, __FILE__, __LINE__, "sbss", "mmaping", fn, "failed", strerror(errno));
- 
-@@ -499,7 +499,24 @@
- 
- 		return -1;
- 	}
-+#else
-+	start = malloc(sce->st.st_size);
-+	if (NULL == start || sce->st.st_size != read(ifd, start, sce->st.st_size)) {
-+		log_error_write(srv, __FILE__, __LINE__, "sbss", "reading", fn, "failed", strerror(errno));
- 
-+		close(ofd);
-+		close(ifd);
-+		free(start);
-+
-+		/* Remove the incomplete cache file, so that later hits aren't served from it */
-+		if (-1 == unlink(p->ofn->ptr)) {
-+			log_error_write(srv, __FILE__, __LINE__, "sbss", "unlinking incomplete cachefile", p->ofn, "failed:", strerror(errno));
-+		}
-+
-+		return -1;
-+	}
-+#endif
-+
- 	switch(type) {
- #ifdef USE_ZLIB
- 	case HTTP_ACCEPT_ENCODING_GZIP:
-@@ -530,7 +547,12 @@
- 		}
- 	}
- 
-+#ifdef USE_MMAP
- 	munmap(start, sce->st.st_size);
-+#else
-+	free(start);
-+#endif
-+
- 	close(ofd);
- 	close(ifd);
- 
-@@ -571,14 +593,24 @@
- 		return -1;
- 	}
- 
--
-+#ifdef USE_MMAP
- 	if (MAP_FAILED == (start = mmap(NULL, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0))) {
- 		log_error_write(srv, __FILE__, __LINE__, "sbss", "mmaping", fn, "failed", strerror(errno));
- 
- 		close(ifd);
- 		return -1;
- 	}
-+#else
-+	start = malloc(sce->st.st_size);
-+	if (NULL == start || sce->st.st_size != read(ifd, start, sce->st.st_size)) {
-+		log_error_write(srv, __FILE__, __LINE__, "sbss", "reading", fn, "failed", strerror(errno));
- 
-+		close(ifd);
-+		free(start);
-+		return -1;
-+	}
-+#endif
-+
- 	switch(type) {
- #ifdef USE_ZLIB
- 	case HTTP_ACCEPT_ENCODING_GZIP:
-@@ -598,7 +630,11 @@
- 		break;
- 	}
- 
-+#ifdef USE_MMAP
- 	munmap(start, sce->st.st_size);
-+#else
-+	free(start);
-+#endif
- 	close(ifd);
- 
- 	if (ret != 0) return -1;
-@@ -826,7 +862,7 @@
- 					}
- 					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;
-+					return (use_etag && p->conf.compress_cache_dir->used) ? HANDLER_GO_ON : HANDLER_FINISHED;
- 				}
- 			}
- 		}
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 2825)
-+++ configure.ac	(revision 2827)
-@@ -569,7 +569,22 @@
-   fi
- fi
- 
-+# disable mmap by default; if a mmapped file gets truncated, the process gets a SIGBUS signal
-+# on reading the truncated area which we can't handle (yet).
-+# lighttpd may always use mmap with files it owns (created tmp files)
-+AC_ARG_ENABLE(mmap,
-+  AC_HELP_STRING([--enable-mmap],[use mmap if available (DANGEROUS, allows local users to trigger SIGBUS crashes)]),
-+  [case "${enableval}" in
-+   yes) mmap=true ;;
-+    no) mmap=false ;;
-+     *) AC_MSG_ERROR(bad value ${enableval} for --enable-mmap) ;;
-+  esac],[mmap=false])
- 
-+if teest x$mmap = xtrue; then
-+  AC_DEFINE(ENABLE_MMAP, [1], [Use mmap if available])
-+fi
-+
-+
- AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
- 
- dnl check for fastcgi lib, for the tests only