svn commit: r501771 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

[mturk]

Author: mturk
Date: Wed Jan 31 00:57:38 2007
New Revision: 501771

URL: http://svn.apache.org/viewvc?view=rev&rev=501771
Log:
Oops. Working on multiple SVN repositories can lead to a real mess :)

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=501771&r1=501770&r2=501771
==============================================================================
--- 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:57:38 
2007
@@ -690,6 +690,7 @@
 
 BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
 {
+    BOOL rv = TRUE;
     ULONG http_filter_revision = HTTP_FILTER_REVISION;
 
     pVer->dwFilterVersion = pVer->dwServerFilterVersion;
@@ -697,6 +698,9 @@
     if (pVer->dwFilterVersion > http_filter_revision) {
         pVer->dwFilterVersion = http_filter_revision;
     }
+    if (!is_inited) {
+        rv = initialize_extension();
+    }
     if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
         pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
                         SF_NOTIFY_SECURE_PORT |
@@ -711,12 +715,9 @@
                         SF_NOTIFY_NONSECURE_PORT |
                         SF_NOTIFY_PREPROC_HEADERS;
     }
-    if (!is_inited) {
-        return initialize_extension();
-    }
 
     strcpy(pVer->lpszFilterDesc, VERSION_STRING);
-    return TRUE;
+    return rv;
 }
 
 static int simple_rewrite(char *uri)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]