Some Windows tweaks from William Rowe...

Submitted by:	William Rowe

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

diff --git a/Apache.dsw b/Apache.dsw
index 742d9d86316af75bdf09f6854f7a459f2ea057de..e890d1758a32a84ad1127388d2714e281c0e2743 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -74,6 +74,12 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ApacheCore
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprlibdll
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -302,6 +308,12 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name ApacheModuleAuthDigest
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name htdigest
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name logresolve
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -428,6 +440,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name aprlib
+    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index d37096fb86902b0ed9c2011fc7840edb533f2124..582c9da83efb0cb4ff0e0a823e5a585008906104 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -94,6 +94,7 @@
 #include "http_request.h"
 #include "http_log.h"
 #include "http_protocol.h"
+#include "ap.h"
 #include "ap_ctype.h"
 #include "util_uri.h"
 #include "util_md5.h"

diff --git a/modules/aaa/mod_auth_digest.dsp b/modules/aaa/mod_auth_digest.dsp
index 7e18d755bcbdca9fbc983d3684e224eac914692a..6951c258e895c707fdad039fb4a1bec2f42f108f 100644 (file)
--- a/modules/aaa/mod_auth_digest.dsp
+++ b/modules/aaa/mod_auth_digest.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "SHARED_MODULE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "SHARED_MODULE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/support/htdigest.dsp b/support/htdigest.dsp
index 7a402b4f017b36b275c901a2e28be467926757de..e10cd35b8d697cf989fe5d068f4191bc8dec3240 100644 (file)
--- a/support/htdigest.dsp
+++ b/support/htdigest.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"release/htdigest.exe"
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"release/htdigest.exe"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib\apr\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"debug/htdigest.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"debug/htdigest.exe" /pdbtype:sept
 
 !ENDIF 
 
@@ -87,18 +87,6 @@ LINK32=link.exe
 # Name "htdigest - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\ap\ap_cpystrn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ap\ap_getpass.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ap\ap_md5c.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\htdigest.c
 # End Source File
 # End Target

diff --git a/support/htpasswd.c b/support/htpasswd.c
index 455191615b2cb0a09bea64af45b3ef2d7d0b1d72..07a4e8479a63c6ea5b184fbeb6dc99eb8a7f3621 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -80,13 +80,12 @@
  */
 
 #include "apr_lib.h"
+#include "apr_errno.h"
 #include "ap_config.h"
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
 #include "ap.h"
 #include "apr_md5.h"
 #include "ap_sha1.h"
+#include <signal.h>
 
 #ifdef WIN32
 #include <conio.h>

diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp
index 24976404805c740f767921381ff558f289789f93..3471ee58a080cbaf4e76104f61805c19d43ac7c3 100644 (file)
--- a/support/htpasswd.dsp
+++ b/support/htpasswd.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/support/logresolve.c b/support/logresolve.c
index c95fa7d6d25a80ceda39d9d35a3df77a776f5c7e..cc8ff56ff3f2c9b2fa005851e6da44f67f554504 100644 (file)
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -39,12 +39,10 @@
  * that one of these matches the original address.
  */
 
-#include "ap_config.h"
-#include <sys/types.h>
-
+#include "apr.h"
 #include <ctype.h>
 
-#if !defined(MPE) && !defined(BEOS) 
+#if !defined(MPE) && !defined(BEOS) && !defined(WIN32)
 #include <arpa/inet.h>
 #endif
 
@@ -279,6 +277,14 @@ int main (int argc, char *argv[])
     char *bar, hoststring[MAXDNAME + 1], line[MAXLINE], *statfile;
     int i, check;
 
+#ifdef WIN32
+    /*  If we apr'ify this code, ap_create_pool/ap_destroy_pool
+     *  should perform the WSAStartup/WSACleanup for us. 
+     */
+    WSADATA wsaData;
+    WSAStartup(0x101, &wsaData);
+#endif
+
     check = 0;
     statfile = NULL;
     for (i = 1; i < argc; i++) {
@@ -298,7 +304,6 @@ int main (int argc, char *argv[])
        }
     }
 
-
     for (i = 0; i < BUCKETS; i++)
        nscache[i] = NULL;
     for (i = 0; i < MAX_ERR + 2; i++)
@@ -334,6 +339,10 @@ int main (int argc, char *argv[])
            puts(hoststring);
     }
 
+#ifdef WIN32
+     WSACleanup();
+#endif
+
     if (statfile != NULL) {
        FILE *fp;
        fp = fopen(statfile, "w");

diff --git a/support/rotatelogs.dsp b/support/rotatelogs.dsp
index a429f582a93ec769b584fa333e722856f25425f2..f399aca3d83821b81dad11c5485bf895c5ad9da2 100644 (file)
--- a/support/rotatelogs.dsp
+++ b/support/rotatelogs.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"