You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.6 KiB
48 lines
1.6 KiB
19 years ago
|
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 <string>
|
||
|
|
#include <vector>
|
||
|
|
|
||
|
|
+#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/apache2/mod_suphp.c.orig Mon Nov 6 01:57:12 2006
|
||
|
|
+++ src/apache2/mod_suphp.c Tue Jul 31 22:28:28 2007
|
||
|
|
@@ -111,7 +111,7 @@
|
||
|
|
#define SUPHP_ENGINE_UNDEFINED 2
|
||
|
|
|
||
|
|
#ifndef SUPHP_PATH_TO_SUPHP
|
||
|
|
-#define SUPHP_PATH_TO_SUPHP "/usr/sbin/suphp"
|
||
|
|
+#define SUPHP_PATH_TO_SUPHP "@l_prefix@/sbin/suphp"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
typedef struct {
|
||
|
|
@@ -321,8 +321,8 @@
|
||
|
|
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}
|
||
|
|
};
|
||
|
|
|