You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/11/19 19:35:15 UTC
cvs commit: apache-2.0/src/os/win32 mod_isapi.c
wrowe 00/11/19 10:35:15
Modified: src/os/win32 mod_isapi.c
Log:
Disable two features, with warnings, if a relatively Win32 SDK headers
are not available (e.g. stock distribution of MSVC 5.0).
Submitted by: Jeff Trawick
Reviewed by: Will Rowe
Revision Changes Path
1.29 +13 -0 apache-2.0/src/os/win32/mod_isapi.c
Index: mod_isapi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/mod_isapi.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_isapi.c 2000/10/14 23:18:52 1.28
+++ mod_isapi.c 2000/11/19 18:35:14 1.29
@@ -91,6 +91,15 @@
/* We use the exact same header file as the original */
#include <HttpExt.h>
+#if !defined(HSE_REQ_MAP_URL_TO_PATH_EX) \
+ || !defined(HSE_REQ_SEND_RESPONSE_HEADER_EX)
+#pragma message("WARNING: This build of Apache is missing the recent changes")
+#pragma message("in the Microsoft Win32 Platform SDK; some mod_isapi features")
+#pragma message("will be disabled. To obtain the latest Platform SDK files,")
+#pragma message("please refer to:")
+#pragma message("http://msdn.microsoft.com/downloads/sdks/platform/platform.asp")
+#endif
+
/* TODO: Unknown errors that must be researched for correct codes */
#define TODO_ERROR 1
@@ -980,6 +989,7 @@
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
+#ifdef HSE_REQ_MAP_URL_TO_PATH_EX
case 1012: /* HSE_REQ_MAP_URL_TO_PATH_EX */
{
/* Map a URL to a filename */
@@ -1048,6 +1058,7 @@
| (subreq->finfo.protection & APR_UEXECUTE ? 0x204 : 0);
return TRUE;
}
+#endif
case 1014: /* HSE_REQ_ABORTIVE_CLOSE */
if (cid->sconf->LogNotSupported)
@@ -1066,6 +1077,7 @@
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
+#ifdef HSE_REQ_SEND_RESPONSE_HEADER_EX
case 1016: /* HSE_REQ_SEND_RESPONSE_HEADER_EX Added in ISAPI 4.0 */
{
LPHSE_SEND_HEADER_EX_INFO shi
@@ -1094,6 +1106,7 @@
return TRUE;
}
+#endif
case 1017: /* HSE_REQ_CLOSE_CONNECTION Added after ISAPI 4.0 */
if (cid->sconf->LogNotSupported)