Author: rjung
Date: Sun Sep 2 12:45:06 2007
New Revision: 572129
URL: http://svn.apache.org/viewvc?rev=572129&view=rev
Log:
Fix crash during startup when using worker configuration inheritance
(attribute "reference") and log level debug.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=572129&r1=572128&r2=572129&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sun Sep 2 12:45:06 2007
@@ -577,13 +577,23 @@
void jk_map_dump(jk_map_t *m, jk_logger_t *l)
{
if (m) {
- if (JK_IS_DEBUG_LEVEL(l)) {
- int s = jk_map_size(m);
- int i;
- for (i=0;i<s;i++) {
+ int s = jk_map_size(m);
+ int i;
+ for (i=0;i<s;i++) {
+ if (!jk_map_name_at(m, i)) {
+ jk_log(l, JK_LOG_WARNING,
+ "Map contains empty name at index %d\n", i);
+ }
+ if (!jk_map_value_at(m, i)) {
+ jk_log(l, JK_LOG_WARNING,
+ "Map contains empty value for name '%s' at index %d\n",
+ jk_map_name_at(m, i), i);
+ }
+ if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
"Dump of map: '%s' -> '%s'",
- jk_map_name_at(m, i), jk_map_value_at(m, i));
+ jk_map_name_at(m, i) ? jk_map_name_at(m, i) : "(null)",
+ jk_map_value_at(m, i) ? jk_map_value_at(m, i) :
"(null)");
}
}
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=572129&r1=572128&r2=572129&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Sep 2
12:45:06 2007
@@ -44,6 +44,10 @@
<subsection name="Native">
<changelog>
<fix>
+ Fix crash during startup when using worker configuration inheritance
+ (attribute "reference") and log level debug. (rjung)
+ </fix>
+ <fix>
AJP13: Match header names exactly against pre defined constants. Avoid
possible confusion with custom header names using a standard header
name
as a prefix. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
