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/21 17:09:49 UTC
cvs commit: apache-1.3/src/os/win32 mod_isapi.c
wrowe 00/11/21 08:09:48
Modified: htdocs/manual win_compiling.html
src/os/win32 mod_isapi.c
Log:
Add a detailed note to the build if the Win32 environment is out of date,
and document the issue in win_compiling.html.
Revision Changes Path
1.5 +22 -5 httpd-docs-1.3/htdocs/manual/win_compiling.html
Index: win_compiling.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/win_compiling.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- win_compiling.html 2000/08/08 14:56:23 1.4
+++ win_compiling.html 2000/11/21 16:09:42 1.5
@@ -21,11 +21,12 @@
before you begin.</P>
<P>Compiling Apache requires Microsoft Visual C++ 5.0 or 6.0 to be properly
- installed. It is easiest to compile with the command-line tools
- (nmake, <EM>etc.</EM>..). Consult the VC++ manual to determine how
+ installed. It can be built with command-line tools, or within the
+ Visual Studio environment. Consult the VC++ manual to determine how
to install them. Be especially aware that the vcvars32.bat file
- from the Program Files/DevStudio/VC/bin folder may be required to
- prepare the command-line environment for command-line builds!</P>
+ from the Program Files/DevStudio/VC/bin folder, and the setenv.bat file
+ from the Platform SDK may be required to prepare the command-line tools
+ for command-line builds (e.g. using nmake).</P>
<P>First, unpack the Apache distribution into an appropriate
directory. Open a command-line prompt, and change to the
@@ -49,7 +50,23 @@
"c:\Program Files\DevStudio\VC\Bin\VCVARS32.BAT"
</PRE>
(you will need to adjust this command so it matches the directory where
- your VC was installed.) Then try the nmake command again.</P>
+ your VC was installed.)</P>
+
+<P>If you are a Visual C++ 5.0 user, and have installed a recent Platform SDK,
+ you may also need to enter the following command (adjusted for the install
+ directory of the Platform SDK update);
+<PRE>
+ "c:\Program Files\Platform SDK\SETENV.BAT"
+</PRE>
+ Then try the nmake command again.</P>
+
+<P><STRONG>Note</STRONG> that the Windows
+ Platform SDK update is required to enable all supported mod_isapi features.
+ The SDK files distributed with Microsoft Visual C++ 5.0 are out of date.
+ Without a recent update, Apache will issue warnings under MSVC++ 5.0
+ that some mod_isapi features will be disabled. Look for the update at
+ <A HREF="http://msdn.microsoft.com/downloads/sdks/platform/platform.asp"
+ >http://msdn.microsoft.com/downloads/sdks/platform/platform.asp</A>.</P>
<P>Apache can also be compiled using VC++'s Visual Studio development
environment. To simplify this process, a Visual Studio workspace,
1.26 +13 -0 apache-1.3/src/os/win32/mod_isapi.c
Index: mod_isapi.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/mod_isapi.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_isapi.c 2000/11/14 09:57:47 1.25
+++ mod_isapi.c 2000/11/21 16:09:46 1.26
@@ -92,6 +92,15 @@
define this to conform */
#define RELAX_HEADER_RULE
+#if !defined(HSE_REQ_SEND_RESPONSE_HEADER_EX) \
+ || !defined(HSE_REQ_MAP_URL_TO_PATH_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
+
module isapi_module;
static DWORD ReadAheadBuffer = 49152;
@@ -661,6 +670,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 */
@@ -729,6 +739,7 @@
| (subreq->finfo.st_mode & _S_IEXEC ? 0x204 : 0);
return TRUE;
}
+#endif
case 1014: /* HSE_REQ_ABORTIVE_CLOSE */
if (LogNotSupported)
@@ -747,6 +758,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
@@ -756,6 +768,7 @@
return SendResponseHeaderEx(cid, shi->pszStatus, shi->pszHeader,
shi->cchStatus, shi->cchHeader);
}
+#endif
case 1017: /* HSE_REQ_CLOSE_CONNECTION Added after ISAPI 4.0 */
if (LogNotSupported)