Author: rjung
Date: Mon Nov 19 12:15:04 2007
New Revision: 596422
URL: http://svn.apache.org/viewvc?rev=596422&view=rev
Log:
Log no match case.
Port from r593497 and r596421 of apache-2.0/mod_jk.c.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=596422&r1=596421&r2=596422&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Nov 19 12:15:04
2007
@@ -16,12 +16,12 @@
*/
/***************************************************************************
- * Description: Apache 1.3 plugin for Tomcat *
+ * Description: Apache 1.3 plugin for Tomcat *
* See ../common/jk_service.h for general mod_jk info *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Dan Milstein <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision$ *
+ * Version: $Revision$ *
***************************************************************************/
/*
@@ -2773,22 +2773,28 @@
}
}
}
- else if (conf->strip_session == JK_TRUE) {
- char *jsessionid;
- if (r->uri) {
- jsessionid = strstr(r->uri, JK_PATH_SESSION_IDENTIFIER);
- if (jsessionid) {
- if (JK_IS_DEBUG_LEVEL(conf->log))
- jk_log(conf->log, JK_LOG_DEBUG,
- "removing session identifier [%s] for non
servlet url [%s]",
- jsessionid, r->uri);
- *jsessionid = '\0';
+ else {
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "no match for %s found",
+ r->uri);
+ if (conf->strip_session == JK_TRUE) {
+ char *jsessionid;
+ if (r->uri) {
+ jsessionid = strstr(r->uri,
JK_PATH_SESSION_IDENTIFIER);
+ if (jsessionid) {
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "removing session identifier [%s] for
non servlet url [%s]",
+ jsessionid, r->uri);
+ *jsessionid = '\0';
+ }
+ }
+ if (r->filename) {
+ jsessionid = strstr(r->filename,
JK_PATH_SESSION_IDENTIFIER);
+ if (jsessionid)
+ *jsessionid = '\0';
}
- }
- if (r->filename) {
- jsessionid = strstr(r->filename,
JK_PATH_SESSION_IDENTIFIER);
- if (jsessionid)
- *jsessionid = '\0';
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
