diff options
| author | Pierre Habouzit <madcoder@debian.org> | 2008-02-27 15:56:49 +0000 |
|---|---|---|
| committer | Pierre Habouzit <madcoder@debian.org> | 2008-02-27 15:56:49 +0000 |
| commit | ec7ae7fd534f2514a6108b7de42daa51fb1cf0f6 (patch) | |
| tree | c68c06134b4c5860d0fcb39126c74fdca61b6248 | |
| parent | b0808ca4bd4ded9dd504fa38c6d7765b5d1c4bda (diff) | |
| download | lighttpd-ec7ae7fd534f2514a6108b7de42daa51fb1cf0f6.tar.gz | |
Add patch for 466663debian/1.4.18-2
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/patches/00list | 2 | ||||
| -rw-r--r-- | debian/patches/05_fdevent_fix.dpatch | 43 |
3 files changed, 49 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index bd9735d..933cd66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,21 +1,12 @@ -lighttpd (1.4.18-2~bpo40+2) etch-backports; urgency=low - - * Rebuild for Etch backports from the proper svn. - - -- Pierre Habouzit <madcoder@debian.org> Wed, 30 Jan 2008 10:30:39 +0100 - -lighttpd (1.4.18-2~bpo40+1) etch-backports; urgency=low - - * Rebuild for Etch backports. - - -- Pierre Habouzit <madcoder@debian.org> Sat, 26 Jan 2008 17:32:28 +0100 - -lighttpd (1.4.18-2) UNRELEASED; urgency=low +lighttpd (1.4.18-2) unstable; urgency=high * Move the aliases on /doc/ and /images/ mandated by policy at the end to circumvent #445459. + * Add patches/05_fdevent_fix.dpatch to fix possible remote DoS + (Closes: 466663). + * bump urgency for security fix. - -- Pierre Habouzit <madcoder@debian.org> Thu, 20 Dec 2007 13:35:57 +0100 + -- Pierre Habouzit <madcoder@debian.org> Wed, 27 Feb 2008 16:56:16 +0100 lighttpd (1.4.18-1) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index ebf93e8..91ea0ab 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,4 @@ 02_fastcgi_detach.dpatch 03_ldap_leak_bugfix.dpatch 04_ldap_build_filter_fix.dpatch - +05_fdevent_fix.dpatch diff --git a/debian/patches/05_fdevent_fix.dpatch b/debian/patches/05_fdevent_fix.dpatch new file mode 100644 index 0000000..81cba49 --- /dev/null +++ b/debian/patches/05_fdevent_fix.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +## DP: From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 +## DP: From: =?utf-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de> +## DP: Date: Wed, 13 Feb 2008 00:07:22 +0100 +## DP: Subject: [PATCH] Fix #372 + #1562 +## DP: +## DP: --- +## DP: src/fdevent_solaris_devpoll.c | 2 +- +## DP: src/server.c | 3 --- +## DP: 2 files changed, 1 insertions(+), 4 deletions(-) +## DP: +@DPATCH@ +diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c +index f77daef..76414a4 100644 +--- a/src/fdevent_solaris_devpoll.c ++++ b/src/fdevent_solaris_devpoll.c +@@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { + int ret; + + dopoll.dp_timeout = timeout_ms; +- dopoll.dp_nfds = ev->maxfds; ++ dopoll.dp_nfds = ev->maxfds - 1; + dopoll.dp_fds = ev->devpollfds; + + ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); +diff --git a/src/server.c b/src/server.c +index 052130a..585a973 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -697,9 +697,6 @@ int main (int argc, char **argv) { + } + } + +- /* #372: solaris need some fds extra for devpoll */ +- if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; +- + if (srv->event_handler == FDEVENT_HANDLER_SELECT) { + srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; + } else { +-- +1.5.3.8 + |