Author: rjung
Date: Mon Dec 29 13:52:50 2014
New Revision: 1648345
URL: http://svn.apache.org/r1648345
Log:
PR 52483: Apache: Add debug logging for result
of JkOptions configuration processing.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1648345&r1=1648344&r2=1648345&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Mon Dec 29 13:52:50 2014
@@ -600,6 +600,79 @@ static jk_uri_worker_map_t * JK_METHOD w
/* Utility functions */
/* ====================================================================== */
+static void dump_options(server_rec *srv, ap_pool *p)
+{
+ char server_name[80];
+ jk_server_conf_t *conf = (jk_server_conf_t
*)ap_get_module_config(srv->module_config,
+
&jk_module);
+ int options = conf->options;
+ ws_vhost_to_text(srv, server_name, 80);
+ if (options & JK_OPT_FWDURICOMPAT)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURICompat", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURICOMPAT ? " (default)" : "");
+ if (options & JK_OPT_FWDURICOMPATUNPARSED)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURICompatUnparsed", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURICOMPATUNPARSED ? " (default)" :
"");
+ if (options & JK_OPT_FWDURIESCAPED)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURIEscaped", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURIESCAPED ? " (default)" : "");
+ if (options & JK_OPT_FWDURIPROXY)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURIProxy", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURIPROXY ? " (default)" : "");
+ if (options & JK_OPT_FWDDIRS)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardDirectories", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDDIRS ? " (default)" : "");
+ if (options & JK_OPT_FWDLOCAL)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardLocalAddress", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDLOCAL ? " (default)" : "");
+ if (options & JK_OPT_FWDPHYSICAL)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardPhysicalAddress", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDPHYSICAL ? " (default)" : "");
+ if (options & JK_OPT_FWDCERTCHAIN)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardSSLCertChain", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDCERTCHAIN ? " (default)" : "");
+ if (options & JK_OPT_FWDKEYSIZE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardKeySize", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDKEYSIZE ? " (default)" : "");
+ if (options & JK_OPT_FLUSHPACKETS)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "FlushPackets", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FLUSHPACKETS ? " (default)" : "");
+ if (options & JK_OPT_FLUSHEADER)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "FlushHeader", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FLUSHEADER ? " (default)" : "");
+ if (options & JK_OPT_DISABLEREUSE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "DisableReuse", server_name,
+ JK_OPT_DEFAULT & JK_OPT_DISABLEREUSE ? " (default)" : "");
+ if (options & JK_OPT_REJECTUNSAFE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "RejectUnsafeURI", server_name,
+ JK_OPT_DEFAULT & JK_OPT_REJECTUNSAFE ? " (default)" : "");
+ if (options & JK_OPT_COLLAPSEALL)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "CollapseSlashesAll", server_name,
+ JK_OPT_DEFAULT & JK_OPT_COLLAPSEALL ? " (default)" : "");
+ if (options & JK_OPT_COLLAPSENONE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "CollapseSlashesNone", server_name,
+ JK_OPT_DEFAULT & JK_OPT_COLLAPSENONE ? " (default)" : "");
+ if (options & JK_OPT_COLLAPSEUNMOUNT)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "CollapseSlashesUnmount", server_name,
+ JK_OPT_DEFAULT & JK_OPT_COLLAPSEUNMOUNT ? " (default)" : "");
+}
+
/* Log something to JK log file then exit */
static void jk_error_exit(const char *file,
int line,
@@ -3016,6 +3089,7 @@ static void jk_init(server_rec * s, ap_p
sconf->was_initialized = JK_TRUE;
open_jk_log(srv, p);
sconf->options &= ~sconf->exclude_options;
+ dump_options(srv, p);
if (sconf->uri_to_context) {
if (!uri_worker_map_alloc(&(sconf->uw_map),
sconf->uri_to_context, sconf->log))
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1648345&r1=1648344&r2=1648345&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Dec 29 13:52:50 2014
@@ -653,6 +653,79 @@ static jk_uri_worker_map_t * JK_METHOD w
/* Utility functions */
/* ========================================================================= */
+static void dump_options(server_rec *srv, apr_pool_t *p)
+{
+ char server_name[80];
+ jk_server_conf_t *conf = (jk_server_conf_t
*)ap_get_module_config(srv->module_config,
+
&jk_module);
+ int options = conf->options;
+ ws_vhost_to_text(srv, server_name, 80);
+ if (options & JK_OPT_FWDURICOMPAT)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURICompat", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURICOMPAT ? " (default)" : "");
+ if (options & JK_OPT_FWDURICOMPATUNPARSED)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURICompatUnparsed", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURICOMPATUNPARSED ? " (default)" :
"");
+ if (options & JK_OPT_FWDURIESCAPED)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURIEscaped", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURIESCAPED ? " (default)" : "");
+ if (options & JK_OPT_FWDURIPROXY)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardURIProxy", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDURIPROXY ? " (default)" : "");
+ if (options & JK_OPT_FWDDIRS)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardDirectories", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDDIRS ? " (default)" : "");
+ if (options & JK_OPT_FWDLOCAL)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardLocalAddress", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDLOCAL ? " (default)" : "");
+ if (options & JK_OPT_FWDPHYSICAL)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardPhysicalAddress", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDPHYSICAL ? " (default)" : "");
+ if (options & JK_OPT_FWDCERTCHAIN)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardSSLCertChain", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDCERTCHAIN ? " (default)" : "");
+ if (options & JK_OPT_FWDKEYSIZE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "ForwardKeySize", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FWDKEYSIZE ? " (default)" : "");
+ if (options & JK_OPT_FLUSHPACKETS)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "FlushPackets", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FLUSHPACKETS ? " (default)" : "");
+ if (options & JK_OPT_FLUSHEADER)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "FlushHeader", server_name,
+ JK_OPT_DEFAULT & JK_OPT_FLUSHEADER ? " (default)" : "");
+ if (options & JK_OPT_DISABLEREUSE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "DisableReuse", server_name,
+ JK_OPT_DEFAULT & JK_OPT_DISABLEREUSE ? " (default)" : "");
+ if (options & JK_OPT_REJECTUNSAFE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "RejectUnsafeURI", server_name,
+ JK_OPT_DEFAULT & JK_OPT_REJECTUNSAFE ? " (default)" : "");
+ if (options & JK_OPT_COLLAPSEALL)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "CollapseSlashesAll", server_name,
+ JK_OPT_DEFAULT & JK_OPT_COLLAPSEALL ? " (default)" : "");
+ if (options & JK_OPT_COLLAPSENONE)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "CollapseSlashesNone", server_name,
+ JK_OPT_DEFAULT & JK_OPT_COLLAPSENONE ? " (default)" : "");
+ if (options & JK_OPT_COLLAPSEUNMOUNT)
+ jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
+ "CollapseSlashesUnmount", server_name,
+ JK_OPT_DEFAULT & JK_OPT_COLLAPSEUNMOUNT ? " (default)" : "");
+}
+
/* ========================================================================= */
/* Log something to Jk log file then exit */
static void jk_error_exit(const char *file,
@@ -3497,6 +3570,7 @@ static int jk_post_config(apr_pool_t * p
if (open_jklog(srv, pconf))
return HTTP_INTERNAL_SERVER_ERROR;
sconf->options &= ~sconf->exclude_options;
+ dump_options(srv, pconf);
if (sconf->uri_to_context) {
if (!uri_worker_map_alloc(&(sconf->uw_map),
sconf->uri_to_context,
sconf->log))
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1648345&r1=1648344&r2=1648345&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 29 13:52:50 2014
@@ -137,6 +137,10 @@
added to configuration file processing and configuration
updates via the status worker. (rjung)
</add>
+ <add>
+ <bug>52483</bug>: Apache: Add debug logging for result
+ of JkOptions configuration processing. (rjung)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
