Author: rjung
Date: Mon Feb 26 07:16:38 2007
New Revision: 511845
URL: http://svn.apache.org/viewvc?view=rev&rev=511845
Log:
Adjust debug message in jk_uri_worker_map.c to make it better distinguishable
from new message regarding JkStripSession (the old message was misleading).
Make the new validity check for worker attributes compatible with
the "reference" feature. reference was not implemented using jk_util,
so it't not part of the attribute list. It's more kind of an instrinsic map
feature.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
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?view=diff&rev=511845&r1=511844&r2=511845
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Mon Feb 26 07:16:38 2007
@@ -364,21 +364,25 @@
trim(prp);
trim(v);
if (strlen(v) && strlen(prp)) {
- const char *oldv = jk_map_get_string(m, prp, NULL);
+ const char *oldv;
+ int off = strlen(prp) - JK_MAP_REFERENCE_SZ;
/* check the worker properties */
- if (!jk_is_valid_property(prp)) {
- jk_log(l, JK_LOG_ERROR,
- "The attribute '%s' is not supported - please check"
- " the documentation for the supported attributes.",
- prp);
- return JK_FALSE;
- }
- if (jk_is_deprecated_property(prp)) {
- jk_log(l, JK_LOG_WARNING,
- "The attribute '%s' is deprecated - please check"
- " the documentation for the correct replacement.",
- prp);
+ if (off <= 0 || strncmp(&prp[off], JK_MAP_REFERENCE,
JK_MAP_REFERENCE_SZ) ) {
+ if (!jk_is_valid_property(prp)) {
+ jk_log(l, JK_LOG_ERROR,
+ "The attribute '%s' is not supported - please
check"
+ " the documentation for the supported
attributes.",
+ prp);
+ return JK_FALSE;
+ }
+ if (jk_is_deprecated_property(prp)) {
+ jk_log(l, JK_LOG_WARNING,
+ "The attribute '%s' is deprecated - please
check"
+ " the documentation for the correct
replacement.",
+ prp);
+ }
}
+ oldv = jk_map_get_string(m, prp, NULL);
v = jk_map_replace_properties(m, v);
if (oldv) {
if (allow_duplicates && jk_is_unique_property(prp) ==
JK_FALSE) {
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?view=diff&rev=511845&r1=511844&r2=511845
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Mon Feb 26
07:16:38 2007
@@ -582,7 +582,7 @@
if (JK_IS_DEBUG_LEVEL(l)) {
char *url_rewrite = strstr(uri, JK_PATH_SESSION_IDENTIFIER);
if (url_rewrite)
- jk_log(l, JK_LOG_DEBUG, "Removed session id '%s' from '%s'",
+ jk_log(l, JK_LOG_DEBUG, "separating session identifier '%s' from
url '%s'",
url_rewrite, uri);
}
if (JK_IS_DEBUG_LEVEL(l))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
