hgomez 2002/12/11 02:40:38
Modified: jk/native/apache-1.3 mod_jk.c
Log:
Allow log file use in chrooted (for now only OpenBSD) environement.
You'll have to define CHROOTED_APACHE (or later will use the define
added by OpenBSD if any)
provided by Kurt Miller.
Revision Changes Path
1.32 +15 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_jk.c 22 Nov 2002 14:43:00 -0000 1.31
+++ mod_jk.c 11 Dec 2002 10:40:38 -0000 1.32
@@ -734,6 +734,11 @@
/* we need an absolut path */
conf->worker_file = ap_server_root_relative(cmd->pool,worker_file);
+
+#idef CHROOTED_APACHE
+ ap_server_strip_chroot(conf->worker_file,0);
+#endif
+
if (conf->worker_file == worker_file)
conf->worker_file = ap_pstrdup(cmd->pool,worker_file);
@@ -762,6 +767,11 @@
/* we need an absolut path */
conf->log_file = ap_server_root_relative(cmd->pool,log_file);
+
+#idef CHROOTED_APACHE
+ ap_server_strip_chroot(conf->log_file,0);
+#endif
+
if ( conf->log_file == log_file)
conf->log_file = ap_pstrdup(cmd->pool,log_file);
@@ -1742,7 +1752,11 @@
/* Open up log file */
if(conf->log_file && conf->log_level >= 0) {
if(!jk_open_file_logger(&(conf->log), conf->log_file, conf->log_level)) {
+#idef CHROOTED_APACHE
+ conf->log = main_log;
+#else
conf->log = NULL;
+#endif
} else {
main_log = conf->log;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
