This is not a large diff, but it stops a DoS that is trivial to execute. If someone can have a look at this I'd appreciate it.
On Thu, Dec 25, 2008 at 10:31:39AM -0700, Darrin Chandler wrote: > This is a reliability fix from nginx author Igor Sysoev: > > "Recently it was discovered that nginx workers exit abnormally if they > receive Expect header on all systems except FreeBSD, Linux, and > Solaris." > > Working in production on amd64. Light testing went fine on sparc64. > > Please commit. > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/nginx/Makefile,v > retrieving revision 1.10 > diff -u -p -r1.10 Makefile > --- Makefile 7 Dec 2008 20:08:55 -0000 1.10 > +++ Makefile 25 Dec 2008 17:08:52 -0000 > @@ -3,6 +3,7 @@ > COMMENT= robust and small HTTP server and mail proxy server > > DISTNAME= nginx-0.6.34 > +PKGNAME= ${DISTNAME}p0 > CATEGORIES= www > > HOMEPAGE= http://nginx.net/ > Index: patches/patch-src_os_unix_ngx_posix_init_c > =================================================================== > RCS file: patches/patch-src_os_unix_ngx_posix_init_c > diff -N patches/patch-src_os_unix_ngx_posix_init_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_os_unix_ngx_posix_init_c 25 Dec 2008 17:08:52 > -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- src/os/unix/ngx_posix_init.c.orig Mon Dec 3 09:46:46 2007 > ++++ src/os/unix/ngx_posix_init.c Thu Dec 25 09:57:05 2008 > +@@ -22,7 +22,7 @@ ngx_os_io_t ngx_os_io = { > + ngx_unix_recv, > + ngx_readv_chain, > + ngx_udp_unix_recv, > +- NULL, > ++ ngx_unix_send, > + ngx_writev_chain, > + 0 > + }; > > > -- > Darrin Chandler | Phoenix BSD User Group | MetaBUG > dwchand...@stilyagin.com | http://phxbug.org/ | http://metabug.org/ > http://www.stilyagin.com/ | Daemons in the Desert | Global BUG Federation -- Darrin Chandler | Phoenix BSD User Group | MetaBUG dwchand...@stilyagin.com | http://phxbug.org/ | http://metabug.org/ http://www.stilyagin.com/ | Daemons in the Desert | Global BUG Federation
pgpBHUKpENoYc.pgp
Description: PGP signature