Commit a6004b41 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87027 13f79535-47bb-0310-9956-ffa450edef68
parent 6aac1dbd

modules/arch/win32/mod_isapi.c

+13 −0
Original line number Diff line number Diff line
@@ -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 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
        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 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
                      | (subreq->finfo.protection & APR_UEXECUTE ? 0x204 : 0);

        return TRUE;

    }

#endif



    case 1014: /* HSE_REQ_ABORTIVE_CLOSE */

        if (cid->sconf->LogNotSupported)
@@ -1066,6 +1077,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
        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 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
        return TRUE;



    }

#endif



    case 1017: /* HSE_REQ_CLOSE_CONNECTION  Added after ISAPI 4.0 */

        if (cid->sconf->LogNotSupported)

os/win32/mod_isapi.c

+13 −0
Original line number Diff line number Diff line
@@ -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 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
        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 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
                      | (subreq->finfo.protection & APR_UEXECUTE ? 0x204 : 0);

        return TRUE;

    }

#endif



    case 1014: /* HSE_REQ_ABORTIVE_CLOSE */

        if (cid->sconf->LogNotSupported)
@@ -1066,6 +1077,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
        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 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, 
        return TRUE;



    }

#endif



    case 1017: /* HSE_REQ_CLOSE_CONNECTION  Added after ISAPI 4.0 */

        if (cid->sconf->LogNotSupported)