head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE_20060622:1.2
	OPENPKG_2_STABLE:1.2.0.6
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_RELEASE:1.2
	OPENPKG_2_5_SOLID:1.2.0.4
	OPENPKG_2_5_SOLID_BP:1.2
	OPENPKG_2_4_SOLID:1.2.0.2;
locks; strict;
comment	@# @;


1.3
date	2007.06.22.10.54.02;	author rse;	state dead;
branches;
next	1.2;
commitid	ZbFoU2hEtnBxHTms;

1.2
date	2005.09.07.11.42.53;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.09.07.10.11.55;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2005.09.08.07.23.32;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@new OpenPKG world order: upgrade from Apache 1.3 to 2.2 (part 1/3: updated/new 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 <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/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.2
log
@Ok, take the even larger hammer to get suPHP working again: 1. fix the path to the suphp executable (variable was renamed by author) and 2. fix implementation of new suPHP_{Add,Remove}Handler directives and 3. use suPHP_AddHandler directive in apache.base to finally glue Apache and suPHP together under run-time for .suphp scripts
@
text
@@


1.2.2.1
log
@MFC: all suPHP related bugfixes and improvements
@
text
@@


1.1
log
@Fix two nasty suPHP installation bugs:

1. The code did not take the Autoconf variable --with-logfile and its
   resulting macro OPT_LOGFILE into account. This resulted in a broken
   logfile path. Additionally, it missed to include other
   configuration parameters, too.

2. The path to the configuration file suphp.conf was set incorrectly.
   Additionally, no default suphp.conf file was installed.

All those bugs are now fixed.

Discovered by: Birger Krägelin
@
text
@d3 1
a3 1
+++ src/Configuration.cpp	2005-09-07 12:09:45 +0200
d25 15
@