head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.3.0.28 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.26 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.24 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.22 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.20 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.18 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.16 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.14 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.12 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.10 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.8 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.6 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.4 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.2 pkgsrc-2008Q1:1.2.0.8 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.6 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.4 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.2 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.1.1.1.0.14 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.12 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.10 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.8 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.6 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.4 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.2 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2011.04.12.06.19.48; author gls; state dead; branches; next 1.3; 1.3 date 2008.05.17.02.37.24; author obache; state Exp; branches; next 1.2; 1.2 date 2007.06.30.15.05.08; author joerg; state Exp; branches 1.2.8.1; next 1.1; 1.1 date 2005.08.03.16.43.38; author rillig; state Exp; branches 1.1.1.1; next ; 1.2.8.1 date 2008.05.17.03.10.13; author rtr; state Exp; branches; next ; 1.1.1.1 date 2005.08.03.16.43.38; author rillig; state Exp; branches; next ; desc @@ 1.4 log @Ooops, forgot to remove useless patch. @ text @$NetBSD: patch-aa,v 1.3 2008/05/17 02:37:24 obache Exp $ Allow the directives to be set in the global configuration file, too. --- src/apache2/mod_suphp.c.orig 2006-11-06 00:57:12.000000000 +0000 +++ src/apache2/mod_suphp.c @@@@ -321,8 +321,8 @@@@ static const command_rec suphp_cmds[] = AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF, "User and group scripts shall be run as"), #endif - AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"), - AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"), + AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"), + AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"), {NULL} }; @ 1.3 log @Update ap2-suphp to 0.6.3. While here, add DESTDIR support and more adapt sample config file to default settings. * Version 0.6.3 (30 March 2008) - Fixed a possible race condition concerning the check for the right symlink owner. - Added checks for the owner of the parent directories were added. * Version 0.6.2 (19 November 2006) - Made mod_suphp compatible with Apache 2.2 - Modified SmartPtr implementation (hopefully) fixing double free problem - Fixed problem that caused the process to block when more than 4096 were written to stderr - Implemented userdir support - Fixed problem with PATH_INFO and PHP scripts * Version 0.6.1 (26 November 2005) - Changed usage of STL to gain better compatibility with old GCC versions (credits to Jeremy Chadwick for finding the relevant code) - Fixed typos in mod_suphp.c (Apache 1.3) (credits to Johan Ekenberg for finding these typos) - Fixed potential buffer overflow in function suphp_bucket_read() in src/apache2/mod_suphp.c - Fix problems with scripts sending "Last-Modified" headers - Extended autoconf script to look for an installation of APR and to use its includedir when building mod_suphp for Apache 2 - Added support for chroot() call before execution of script @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2007/06/30 15:05:08 joerg Exp $ @ 1.2 log @Use versioned prefix and fix build with Apache 2. @ text @d1 1 a1 1 $NetBSD$ a3 1 Fix APR 1.2 build. d5 1 a5 1 --- src/apache2/mod_suphp.c.orig 2005-02-27 17:56:37.000000000 +0000 d7 1 a7 1 @@@@ -313,8 +313,8 @@@@ static const command_rec suphp_cmds[] = a17 33 @@@@ -558,7 +558,9 @@@@ static int suphp_handler(request_rec *r) return rv; } - APR_BRIGADE_FOREACH(bucket, bb) + for (bucket = APR_BRIGADE_FIRST(bb); + bucket != APR_BRIGADE_SENTINEL(bb); + bucket = APR_BUCKET_NEXT(bucket)) { const char *data; apr_size_t len; @@@@ -629,7 +631,9 @@@@ static int suphp_handler(request_rec *r) const char *buf; apr_size_t blen; - APR_BRIGADE_FOREACH(b, bb) + + for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); + b = APR_BUCKET_NEXT(b)) { if (APR_BUCKET_IS_EOS(b)) break; @@@@ -650,7 +654,9 @@@@ static int suphp_handler(request_rec *r) /* empty brigade (script output) */ const char *buf; apr_size_t blen; - APR_BRIGADE_FOREACH(b, bb) + + for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); + b = APR_BUCKET_NEXT(b)) { if (APR_BUCKET_IS_EOS(b)) break; @ 1.2.8.1 log @pullup ticket #2385 - requested by obache ap2-suphp: update package for fixes revisions pulled up: - pkgsrc/www/ap2-suphp/Makefile 1.14 - pkgsrc/www/ap2-suphp/distinfo 1.4 - pkgsrc/www/ap2-suphp/patches/patch-aa 1.3 - pkgsrc/www/ap2-suphp/patches/patch-ab r0 Module Name: pkgsrc Committed By: obache Date: Sat May 17 02:37:25 UTC 2008 Modified Files: pkgsrc/www/ap2-suphp: Makefile distinfo pkgsrc/www/ap2-suphp/patches: patch-aa Removed Files: pkgsrc/www/ap2-suphp/patches: patch-ab Log Message: Update ap2-suphp to 0.6.3. While here, add DESTDIR support and more adapt sample config file to default settings. * Version 0.6.3 (30 March 2008) - Fixed a possible race condition concerning the check for the right symlink owner. - Added checks for the owner of the parent directories were added. * Version 0.6.2 (19 November 2006) - Made mod_suphp compatible with Apache 2.2 - Modified SmartPtr implementation (hopefully) fixing double free problem - Fixed problem that caused the process to block when more than 4096 were written to stderr - Implemented userdir support - Fixed problem with PATH_INFO and PHP scripts * Version 0.6.1 (26 November 2005) - Changed usage of STL to gain better compatibility with old GCC versions (credits to Jeremy Chadwick for finding the relevant code) - Fixed typos in mod_suphp.c (Apache 1.3) (credits to Johan Ekenberg for finding these typos) - Fixed potential buffer overflow in function suphp_bucket_read() in src/apache2/mod_suphp.c - Fix problems with scripts sending "Last-Modified" headers - Extended autoconf script to look for an installation of APR and to use its includedir when building mod_suphp for Apache 2 - Added support for chroot() call before execution of script @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2007/06/30 15:05:08 joerg Exp $ d4 1 d6 1 a6 1 --- src/apache2/mod_suphp.c.orig 2006-11-06 00:57:12.000000000 +0000 d8 1 a8 1 @@@@ -321,8 +321,8 @@@@ static const command_rec suphp_cmds[] = d19 33 @ 1.1 log @Initial revision @ text @d4 1 d6 2 a7 2 --- src/apache2/mod_suphp.c.orig Sun Feb 27 18:56:37 2005 +++ src/apache2/mod_suphp.c Wed Aug 3 13:19:12 2005 d19 33 @ 1.1.1.1 log @Added ap2-suphp version 0.6.0. The suPHP Apache module together with suPHP itself provides an easy way to run PHP scripts with different users on the same server. It provides security, because the PHP scripts are not run with the rights of the webserver's user. In addition to that you probably won't have to use PHP's "safe mode", which applies many restrictions on the scripts. @ text @@