costin 02/05/22 16:48:18
Modified: jk/native2/server/isapi jk_isapi_plugin.c
Log:
Added few #ifdefs to make it compile with my version of MSVC ( probably
an old one ).
Nacho - let me know if it brakes your build ( but it shouldn't )
Revision Changes Path
1.18 +33 -11
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_isapi_plugin.c 19 May 2002 21:44:23 -0000 1.17
+++ jk_isapi_plugin.c 22 May 2002 23:48:17 -0000 1.18
@@ -60,7 +60,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Larry Isaacs <[EMAIL PROTECTED]> *
* Author: Ignacio J. Ortega <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***************************************************************************/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -161,13 +161,21 @@
if (pVer->dwFilterVersion > http_filter_revision) {
pVer->dwFilterVersion = http_filter_revision;
}
+
+#ifdef SF_NOTIFY_AUTH_COMPLETE
pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
SF_NOTIFY_SECURE_PORT |
SF_NOTIFY_NONSECURE_PORT |
SF_NOTIFY_PREPROC_HEADERS |
SF_NOTIFY_AUTH_COMPLETE;
-
+#else
+ pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
+ SF_NOTIFY_SECURE_PORT |
+ SF_NOTIFY_NONSECURE_PORT |
+ SF_NOTIFY_PREPROC_HEADERS;
+#endif
+
strcpy(pVer->lpszFilterDesc, VERSION_STRING);
if (!is_inited) {
@@ -212,11 +220,18 @@
}
}
}
+#ifdef SF_NOTIFY_AUTH_COMPLETE
if (is_inited &&
(((SF_NOTIFY_PREPROC_HEADERS == dwNotificationType) && !iis5) ||
((SF_NOTIFY_AUTH_COMPLETE == dwNotificationType) && iis5)
)
)
+#else
+ if (is_inited &&
+ (((SF_NOTIFY_PREPROC_HEADERS == dwNotificationType) && !iis5)
+ )
+ )
+#endif
{
char uri[INTERNET_MAX_URL_LENGTH];
char snuri[INTERNET_MAX_URL_LENGTH]="/";
@@ -233,15 +248,22 @@
DWORD szHost = sizeof(Host);
DWORD szTranslate = sizeof(Translate);
- if (iis5) {
-
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 {
-
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->GetHeader;
-
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->SetHeader;
-
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->AddHeader;
- }
+#ifdef SF_NOTIFY_AUTH_COMPLETE
+ if (iis5) {
+
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 {
+
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->GetHeader;
+
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->SetHeader;
+
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->AddHeader;
+ }
+#else
+
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->GetHeader;
+
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->SetHeader;
+
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->AddHeader;
+#endif
+
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
