You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2007/01/31 09:56:13 UTC
svn commit: r501770 -
/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Wed Jan 31 00:56:12 2007
New Revision: 501770
URL: http://svn.apache.org/viewvc?view=rev&rev=501770
Log:
Small fix. Detect auth notification inside initialize_extension and after the config is read
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?view=diff&rev=501770&r1=501769&r2=501770
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Jan 31 00:56:12 2007
@@ -690,7 +690,6 @@
BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
{
- BOOL rv = TRUE;
ULONG http_filter_revision = HTTP_FILTER_REVISION;
pVer->dwFilterVersion = pVer->dwServerFilterVersion;
@@ -698,10 +697,6 @@
if (pVer->dwFilterVersion > http_filter_revision) {
pVer->dwFilterVersion = http_filter_revision;
}
- if (!is_inited) {
- rv = initialize_extension();
- auth_notification_flags = get_auth_flags();
- }
if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
SF_NOTIFY_SECURE_PORT |
@@ -716,9 +711,12 @@
SF_NOTIFY_NONSECURE_PORT |
SF_NOTIFY_PREPROC_HEADERS;
}
+ if (!is_inited) {
+ return initialize_extension();
+ }
strcpy(pVer->lpszFilterDesc, VERSION_STRING);
- return rv;
+ return TRUE;
}
static int simple_rewrite(char *uri)
@@ -1310,6 +1308,7 @@
{
if (read_registry_init_data()) {
+ auth_notification_flags = get_auth_flags();
is_inited = JK_TRUE;
}
return is_inited;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org