pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/lighttpd Update to lighttpd 1.4.15:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/34ac6af6bf6e
branches:  trunk
changeset: 528032:34ac6af6bf6e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 19 16:16:17 2007 +0000

description:
Update to lighttpd 1.4.15:

Most important changes are:
- fix a crash for files with an mtime of 0
- fix cpu hog in certain requests
- added mod_extforward module
- reduced default PATH_MAX to 255

diffstat:

 www/lighttpd/Makefile         |   4 ++--
 www/lighttpd/PLIST            |   4 +++-
 www/lighttpd/distinfo         |  16 ++++------------
 www/lighttpd/patches/patch-aa |  13 -------------
 www/lighttpd/patches/patch-ab |  13 -------------
 www/lighttpd/patches/patch-ac |  13 -------------
 www/lighttpd/patches/patch-ad |  13 -------------
 www/lighttpd/patches/patch-ae |  13 -------------
 www/lighttpd/patches/patch-af |  14 --------------
 www/lighttpd/patches/patch-ag |  12 ------------
 www/lighttpd/patches/patch-ah |  43 -------------------------------------------
 11 files changed, 9 insertions(+), 149 deletions(-)

diffs (224 lines):

diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/Makefile
--- a/www/lighttpd/Makefile     Thu Apr 19 16:11:34 2007 +0000
+++ b/www/lighttpd/Makefile     Thu Apr 19 16:16:17 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2007/02/19 21:31:30 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/19 16:16:17 joerg Exp $
 
-DISTNAME=      lighttpd-1.4.13
+DISTNAME=      lighttpd-1.4.15
 CATEGORIES=    www
 MASTER_SITES=  http://www.lighttpd.net/download/
 
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/PLIST
--- a/www/lighttpd/PLIST        Thu Apr 19 16:11:34 2007 +0000
+++ b/www/lighttpd/PLIST        Thu Apr 19 16:16:17 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/19 21:31:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/04/19 16:16:17 joerg Exp $
 bin/spawn-fcgi
 lib/lighttpd/mod_access.la
 lib/lighttpd/mod_accesslog.la
@@ -11,6 +11,7 @@
 lib/lighttpd/mod_evasive.la
 lib/lighttpd/mod_evhost.la
 lib/lighttpd/mod_expire.la
+lib/lighttpd/mod_extforward.la
 lib/lighttpd/mod_fastcgi.la
 lib/lighttpd/mod_flv_streaming.la
 lib/lighttpd/mod_indexfile.la
@@ -50,6 +51,7 @@
 share/doc/lighttpd/dirlisting.txt
 share/doc/lighttpd/evhost.txt
 share/doc/lighttpd/expire.txt
+share/doc/lighttpd/extforward.txt
 share/doc/lighttpd/fastcgi-state.dot
 share/doc/lighttpd/fastcgi-state.txt
 share/doc/lighttpd/fastcgi.txt
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/distinfo
--- a/www/lighttpd/distinfo     Thu Apr 19 16:11:34 2007 +0000
+++ b/www/lighttpd/distinfo     Thu Apr 19 16:16:17 2007 +0000
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.8 2007/02/19 21:31:33 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/04/19 16:16:17 joerg Exp $
 
-SHA1 (lighttpd-1.4.13.tar.gz) = b17553e66609f85baec50263712a4a5aeca50ca5
-RMD160 (lighttpd-1.4.13.tar.gz) = 4e67e42dc3692d50c044561cc903de7b906f260c
-Size (lighttpd-1.4.13.tar.gz) = 797813 bytes
-SHA1 (patch-aa) = f1e8cad740e6ede7fdc38367f75a7ef9d5605a71
-SHA1 (patch-ab) = 1a8e05b1f347adc9314d9b543d6f3b0e5e3bcfbd
-SHA1 (patch-ac) = 5b29d06bb002eac055b024784d11296d8df28d16
-SHA1 (patch-ad) = 56d94ebf9a5f9809dff67e6be6031a37dd07eda1
-SHA1 (patch-ae) = 33cc3cac3746b1c53e386776deeca3aef0863541
-SHA1 (patch-af) = 8e3de40f9230e672a4d09ab688c7b864c661390d
-SHA1 (patch-ag) = ae22b00ec1d7af2cb2ba67deb22a705ba2677711
-SHA1 (patch-ah) = edd5bd1662f2ff11b1e2fc2a84f939c6b2e584d0
+SHA1 (lighttpd-1.4.15.tar.gz) = 67ba1279a0eaeda728c1e1143d302beb364a034c
+RMD160 (lighttpd-1.4.15.tar.gz) = a38cb73797da1b8773b4c4a34f16be097667db57
+Size (lighttpd-1.4.15.tar.gz) = 794327 bytes
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-aa
--- a/www/lighttpd/patches/patch-aa     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/12/22 21:07:11 joerg Exp $
-
---- src/network_backends.h.orig        2006-12-22 20:42:35.000000000 +0000
-+++ src/network_backends.h
-@@ -14,7 +14,7 @@
- # include <sys/uio.h>
- #endif
- 
--#if defined HAVE_SYS_UIO_H && defined HAVE_SENDFILE && defined HAVE_WRITEV && defined(__FreeBSD__)
-+#if defined HAVE_SYS_UIO_H && defined HAVE_SENDFILE && defined HAVE_WRITEV && (defined(__FreeBSD__) || defined(__DragonFly__))
- # define USE_FREEBSD_SENDFILE
- # include <sys/uio.h>
- #endif
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-ab
--- a/www/lighttpd/patches/patch-ab     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/02/19 21:31:34 joerg Exp $
-
---- src/network_freebsd_sendfile.c.orig        2006-10-04 13:29:17.000000000 +0000
-+++ src/network_freebsd_sendfile.c
-@@ -25,7 +25,7 @@
- 
- 
- #ifndef UIO_MAXIOV
--# ifdef __FreeBSD__
-+# if defined(__FreeBSD__) || defined(__DragonFly__)
- /* FreeBSD 4.7, 4.9 defined it in sys/uio.h only if _KERNEL is specified */
- #  define UIO_MAXIOV 1024
- # endif
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-ac
--- a/www/lighttpd/patches/patch-ac     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/02/19 21:31:34 joerg Exp $
-
---- src/network_writev.c.orig  2006-10-07 17:25:51.000000000 +0000
-+++ src/network_writev.c
-@@ -55,7 +55,7 @@ int network_write_chunkqueue_writev(serv
-                       const size_t max_chunks = MAX_IOVEC;
- #elif defined(UIO_MAXIOV) /* Linux x86 (glibc-2.2.5-233) */
-                       const size_t max_chunks = UIO_MAXIOV;
--#elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) /* FreeBSD 4.x */
-+#elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__DragonFly__) /* FreeBSD 4.x */
-                       const size_t max_chunks = 1024; /* UIO_MAXIOV value from sys/uio.h */
- #else
- #error "sysconf() doesnt return _SC_IOV_MAX ..., check the output of 'man writev' for the EINVAL error and send the output to jan%kneschke.de@localhost"
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-ad
--- a/www/lighttpd/patches/patch-ad     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/02/19 21:31:36 joerg Exp $
-
---- configure.in.orig  2007-02-19 21:15:12.000000000 +0000
-+++ configure.in
-@@ -398,7 +398,7 @@ AC_ARG_WITH(lua, AC_HELP_STRING([--with-
- 
- AC_MSG_RESULT($WITH_LUA)
- if test "$WITH_LUA" != "no"; then
-- if test "$WITH_LUA" == "yes"; then
-+ if test "$WITH_LUA" = "yes"; then
-   WITH_LUA=lua
-  fi
-  PKG_CHECK_MODULES(LUA, $WITH_LUA >= 5.1, [
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-ae
--- a/www/lighttpd/patches/patch-ae     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/02/19 21:31:37 joerg Exp $
-
---- configure.orig     2007-02-19 21:14:50.000000000 +0000
-+++ configure
-@@ -26988,7 +26988,7 @@ fi;
- echo "$as_me:$LINENO: result: $WITH_LUA" >&5
- echo "${ECHO_T}$WITH_LUA" >&6
- if test "$WITH_LUA" != "no"; then
-- if test "$WITH_LUA" == "yes"; then
-+ if test "$WITH_LUA" = "yes"; then
-   WITH_LUA=lua
-  fi
- 
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-af
--- a/www/lighttpd/patches/patch-af     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/02/19 21:31:37 joerg Exp $
-
---- src/http_auth.c.orig       2006-10-04 13:29:17.000000000 +0000
-+++ src/http_auth.c
-@@ -733,7 +733,8 @@ static int http_auth_basic_password_comp
-                       }
-               }
- 
--
-+              if (p->conf.auth_ldap_allow_empty_pw != 1 && pw[0] == '\0')
-+                      return -1;
- 
-               /* build filter */
-               buffer_copy_string_buffer(p->ldap_filter, p->conf.ldap_filter_pre);
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-ag
--- a/www/lighttpd/patches/patch-ag     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/02/19 21:31:37 joerg Exp $
-
---- src/http_auth.h.orig       2006-10-04 13:29:17.000000000 +0000
-+++ src/http_auth.h
-@@ -36,6 +36,7 @@ typedef struct {
-       buffer *auth_ldap_filter;
-       buffer *auth_ldap_cafile;
-       unsigned short auth_ldap_starttls;
-+      unsigned short auth_ldap_allow_empty_pw;
- 
-       unsigned short auth_debug;
- 
diff -r 3db104289fe0 -r 34ac6af6bf6e www/lighttpd/patches/patch-ah
--- a/www/lighttpd/patches/patch-ah     Thu Apr 19 16:11:34 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/02/19 21:31:37 joerg Exp $
-
---- src/mod_auth.c.orig        2006-10-04 13:29:17.000000000 +0000
-+++ src/mod_auth.c
-@@ -113,6 +113,7 @@ static int mod_auth_patch_connection(ser
-       PATCH(auth_ldap_filter);
-       PATCH(auth_ldap_cafile);
-       PATCH(auth_ldap_starttls);
-+      PATCH(auth_ldap_allow_empty_pw);
- #ifdef USE_LDAP
-       PATCH(ldap);
-       PATCH(ldap_filter_pre);
-@@ -160,6 +161,8 @@ static int mod_auth_patch_connection(ser
-                               PATCH(auth_ldap_cafile);
-                       } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) {
-                               PATCH(auth_ldap_starttls);
-+                      } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
-+                              PATCH(auth_ldap_allow_empty_pw);
-                       }
-               }
-       }
-@@ -312,6 +315,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) 
-               { "auth.backend.ldap.starttls",     NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
-               { "auth.backend.ldap.bind-dn",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-               { "auth.backend.ldap.bind-pw",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
-+              { "auth.backend.ldap.allow-empty-pw",     NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
-               { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-               { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-               { "auth.debug",                     NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },  /* 13 */
-@@ -361,9 +365,10 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) 
-               cv[8].destination = &(s->auth_ldap_starttls);
-               cv[9].destination = s->auth_ldap_binddn;
-               cv[10].destination = s->auth_ldap_bindpw;
--              cv[11].destination = s->auth_htdigest_userfile;
--              cv[12].destination = s->auth_htpasswd_userfile;
--              cv[13].destination = &(s->auth_debug);
-+              cv[11].destination = &(s->auth_ldap_allow_empty_pw);
-+              cv[12].destination = s->auth_htdigest_userfile;
-+              cv[13].destination = s->auth_htpasswd_userfile;
-+              cv[14].destination = &(s->auth_debug);
- 
-               p->config_storage[i] = s;
-               ca = ((data_config *)srv->config_context->data[i])->value;



Home | Main Index | Thread Index | Old Index