Author: rjung
Date: Tue Jun 19 05:34:33 2007
New Revision: 548709
URL: http://svn.apache.org/viewvc?view=rev&rev=548709
Log:
Apache: Add forwarding uri to debug log.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
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?view=diff&rev=548709&r1=548708&r2=548709
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Tue Jun 19 05:34:33
2007
@@ -578,24 +578,6 @@
s->no_more_chunks = 0;
s->query_string = r->args;
- /* Dump all connection param so we can trace what's going to
- * the remote tomcat
- */
- if (JK_IS_DEBUG_LEVEL(conf->log)) {
- jk_log(conf->log, JK_LOG_DEBUG,
- "Service protocol=%s method=%s host=%s addr=%s name=%s port=%d
auth=%s user=%s laddr=%s raddr=%s",
- STRNULL_FOR_NULL(s->protocol),
- STRNULL_FOR_NULL(s->method),
- STRNULL_FOR_NULL(s->remote_host),
- STRNULL_FOR_NULL(s->remote_addr),
- STRNULL_FOR_NULL(s->server_name),
- s->server_port,
- STRNULL_FOR_NULL(s->auth_type),
- STRNULL_FOR_NULL(s->remote_user),
- STRNULL_FOR_NULL(r->connection->local_ip),
- STRNULL_FOR_NULL(r->connection->remote_ip));
- }
-
/*
* The 2.2 servlet spec errata says the uri from
* HttpServletRequest.getRequestURI() should remain encoded.
@@ -793,6 +775,26 @@
}
}
s->uw_map = conf->uw_map;
+
+ /* Dump all connection param so we can trace what's going to
+ * the remote tomcat
+ */
+ if (JK_IS_DEBUG_LEVEL(conf->log)) {
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Service protocol=%s method=%s host=%s addr=%s name=%s port=%d
auth=%s user=%s laddr=%s raddr=%s uri=%s",
+ STRNULL_FOR_NULL(s->protocol),
+ STRNULL_FOR_NULL(s->method),
+ STRNULL_FOR_NULL(s->remote_host),
+ STRNULL_FOR_NULL(s->remote_addr),
+ STRNULL_FOR_NULL(s->server_name),
+ s->server_port,
+ STRNULL_FOR_NULL(s->auth_type),
+ STRNULL_FOR_NULL(s->remote_user),
+ STRNULL_FOR_NULL(r->connection->local_ip),
+ STRNULL_FOR_NULL(r->connection->remote_ip),
+ STRNULL_FOR_NULL(s->req_uri));
+ }
+
return JK_TRUE;
}
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=548709&r1=548708&r2=548709
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Jun 19 05:34:33
2007
@@ -606,24 +606,6 @@
s->query_string = r->args;
#endif
- /* Dump all connection param so we can trace what's going to
- * the remote tomcat
- */
- if (JK_IS_DEBUG_LEVEL(conf->log)) {
- jk_log(conf->log, JK_LOG_DEBUG,
- "Service protocol=%s method=%s host=%s addr=%s name=%s port=%d
auth=%s user=%s laddr=%s raddr=%s",
- STRNULL_FOR_NULL(s->protocol),
- STRNULL_FOR_NULL(s->method),
- STRNULL_FOR_NULL(s->remote_host),
- STRNULL_FOR_NULL(s->remote_addr),
- STRNULL_FOR_NULL(s->server_name),
- s->server_port,
- STRNULL_FOR_NULL(s->auth_type),
- STRNULL_FOR_NULL(s->remote_user),
- STRNULL_FOR_NULL(r->connection->local_ip),
- STRNULL_FOR_NULL(r->connection->remote_ip));
- }
-
/*
* The 2.2 servlet spec errata says the uri from
* HttpServletRequest.getRequestURI() should remain encoded.
@@ -822,6 +804,26 @@
}
}
s->uw_map = conf->uw_map;
+
+ /* Dump all connection param so we can trace what's going to
+ * the remote tomcat
+ */
+ if (JK_IS_DEBUG_LEVEL(conf->log)) {
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Service protocol=%s method=%s host=%s addr=%s name=%s port=%d
auth=%s user=%s laddr=%s raddr=%s uri=%s",
+ STRNULL_FOR_NULL(s->protocol),
+ STRNULL_FOR_NULL(s->method),
+ STRNULL_FOR_NULL(s->remote_host),
+ STRNULL_FOR_NULL(s->remote_addr),
+ STRNULL_FOR_NULL(s->server_name),
+ s->server_port,
+ STRNULL_FOR_NULL(s->auth_type),
+ STRNULL_FOR_NULL(s->remote_user),
+ STRNULL_FOR_NULL(r->connection->local_ip),
+ STRNULL_FOR_NULL(r->connection->remote_ip),
+ STRNULL_FOR_NULL(s->req_uri));
+ }
+
return JK_TRUE;
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=548709&r1=548708&r2=548709
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Jun 19
05:34:33 2007
@@ -28,6 +28,9 @@
<subsection name="Native">
<changelog>
<update>
+ Apache: Add forwarding uri to debug log. (rjung)
+ </update>
+ <update>
Docs: Clarify relation between worker names and jvmRoute for load
balancing. (rjung)
</update>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
