Author: rjung
Date: Sun Sep 6 16:03:15 2015
New Revision: 1701496
URL: http://svn.apache.org/r1701496
Log:
Move debug logging of some server variables after
they have been finally set.
Move setting some server variables in "else"
block after code which might have overwriten them.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1701496&r1=1701495&r2=1701496&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Sep 6 16:03:15 2015
@@ -3186,17 +3186,7 @@ static int init_ws_service(isapi_private
s->write = iis_write;
s->done = iis_done;
- GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, (*worker_name));
GET_SERVER_VARIABLE_VALUE(HTTP_URI_HEADER_NAME, s->req_uri);
- GET_SERVER_VARIABLE_VALUE(HTTP_QUERY_HEADER_NAME, s->query_string);
- GET_SERVER_VARIABLE_VALUE_INT(HTTP_WORKER_HEADER_INDEX, worker_index, -1);
-
- if (JK_IS_DEBUG_LEVEL(logger)) {
- jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s",
HTTP_WORKER_HEADER_NAME, (*worker_name));
- jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %d",
HTTP_WORKER_HEADER_INDEX, worker_index);
- jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s",
HTTP_URI_HEADER_NAME, s->req_uri);
- jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s",
HTTP_QUERY_HEADER_NAME, s->query_string);
- }
if (s->req_uri == NULL) {
if (JK_IS_DEBUG_LEVEL(logger))
@@ -3209,6 +3199,17 @@ static int init_ws_service(isapi_private
return JK_FALSE;
}
getparents(s->req_uri);
+ } else {
+ GET_SERVER_VARIABLE_VALUE(HTTP_QUERY_HEADER_NAME, s->query_string);
+ GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, (*worker_name));
+ GET_SERVER_VARIABLE_VALUE_INT(HTTP_WORKER_HEADER_INDEX, worker_index,
-1);
+ }
+
+ if (JK_IS_DEBUG_LEVEL(logger)) {
+ jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s",
HTTP_WORKER_HEADER_NAME, (*worker_name));
+ jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %d",
HTTP_WORKER_HEADER_INDEX, worker_index);
+ jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s",
HTTP_URI_HEADER_NAME, s->req_uri);
+ jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s",
HTTP_QUERY_HEADER_NAME, s->query_string);
}
GET_SERVER_VARIABLE_VALUE("AUTH_TYPE", s->auth_type);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
