mturk 2004/02/27 11:28:51
Modified: jk/native2/server/isapi jk_isapi_plugin.c
Log:
Remove the SF_NOTIFY_AUTH_COMPLETE define
checking. If someone wishes to compile jk2 he will anyhow
need the platform SDK. Any sdk since year 2000 has that
defined in the httpfilt.h
Revision Changes Path
1.60 +5 -17
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- jk_isapi_plugin.c 24 Feb 2004 08:44:42 -0000 1.59
+++ jk_isapi_plugin.c 27 Feb 2004 19:28:51 -0000 1.60
@@ -39,7 +39,6 @@
#include "jk_worker.h"
#include "apr_general.h"
#include "jk_iis.h"
-//#include "jk_uri_worker_map.h"
#define SERVER_ROOT_TAG ("serverRoot")
#define EXTENSION_URI_TAG ("extensionUri")
@@ -160,7 +159,7 @@
pVer->dwFilterVersion = http_filter_revision;
}
auth_notification_flags = get_auth_flags();
-#ifdef SF_NOTIFY_AUTH_COMPLETE
+
if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
SF_NOTIFY_SECURE_PORT |
@@ -168,9 +167,7 @@
SF_NOTIFY_PREPROC_HEADERS |
SF_NOTIFY_AUTH_COMPLETE;
}
- else
-#endif
- {
+ else {
pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
SF_NOTIFY_SECURE_PORT |
SF_NOTIFY_NONSECURE_PORT |
@@ -232,15 +229,13 @@
DWORD szTranslate = sizeof(Translate);
DWORD szPort = sizeof(Port);
int nPort;
-#ifdef SF_NOTIFY_AUTH_COMPLETE
+
if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
GetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->GetHeader;
SetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->SetHeader;
AddHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->AddHeader;
}
- else
-#endif
- {
+ else {
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->GetHeader;
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->SetHeader;
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->AddHeader;
@@ -805,7 +800,6 @@
return env;
}
-#ifdef SF_NOTIFY_AUTH_COMPLETE
static int get_auth_flags()
{
HKEY hkey;
@@ -839,9 +833,3 @@
return rv;
}
-#else
-static int get_auth_flags()
-{
- return SF_NOTIFY_PREPROC_HEADERS;
-}
-#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
