head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2008.12.25.17.24.35;	author rse;	state Exp;
branches;
next	1.1;
commitid	fj8A8dQy8dvr7Svt;

1.1
date	2007.07.31.22.24.36;	author cs;	state Exp;
branches;
next	;
commitid	benTdrJrAyIIgYrs;


desc
@@


1.2
log
@upgrading package: apache-suphp 0.6.3 -> 0.7.0
@
text
@Index: src/Configuration.cpp
--- src/Configuration.cpp.orig	2008-03-29 14:02:36 +0100
+++ src/Configuration.cpp	2008-12-25 18:19:19 +0100
@@@@ -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/apache2/mod_suphp.c
--- src/apache2/mod_suphp.c.orig	2007-03-14 15:50:55 +0100
+++ src/apache2/mod_suphp.c	2008-12-25 18:19:19 +0100
@@@@ -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 {
@


1.1
log
@new package: apache-suphp 0.6.2 (Apache Extension: PHP script executions wrapper)
@
text
@d2 2
a3 2
--- src/Configuration.cpp.orig	2005-02-27 18:53:05 +0100
+++ src/Configuration.cpp	2005-09-07 13:31:39 +0200
d25 3
a27 3
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
a36 11
@@@@ -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}
 };
 
@