head 1.2; access; symbols; locks; strict; comment @# @; 1.2 date 2007.06.22.11.02.07; author rse; state dead; branches; next 1.1; commitid Z5FSE1qba3VhKTms; 1.1 date 2007.02.07.22.18.00; author cs; state Exp; branches; next ; commitid D8v9efI5kdcePB5s; desc @@ 1.2 log @new OpenPKG world order: upgrade from Apache 1.3 to 2.2 (part 3/3: remove obsolete packages) @ text @Index: src/Configuration.cpp --- src/Configuration.cpp.orig 2005-02-27 18:53:05 +0100 +++ src/Configuration.cpp 2005-09-07 13:31:39 +0200 @@@@ -21,6 +21,8 @@@@ #include #include +#include "config.h" + #include "IniFile.hpp" #include "Util.hpp" @@@@ -81,7 +83,11 @@@@ } suPHP::Configuration::Configuration() { +#ifdef OPT_LOGFILE + this->logfile = OPT_LOGFILE; +#else this->logfile = "/var/log/suphp.log"; +#endif #ifdef OPT_APACHE_USER this->webserver_user = OPT_APACHE_USER; #else Index: src/apache/mod_suphp.c --- src/apache/mod_suphp.c.orig 2005-02-27 18:56:37 +0100 +++ src/apache/mod_suphp.c 2005-09-07 13:32:19 +0200 @@@@ -249,9 +249,9 @@@@ {"suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF|ACCESS_CONF, TAKE2, "User and group scripts shall be run as"}, #endif - {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, + {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF|ACCESS_CONF, ITERATE, "Tells mod_suphp to handle these MIME-types"}, - {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, + {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF|ACCESS_CONF, ITERATE, "Tells mod_suphp not to handle these MIME-types"}, {NULL} }; @ 1.1 log @new package: apache-php4 1.3.37 (Apache HTTP Server providing optional PHP4 support (legacy)) @ text @@