Commit 8b230f0b authored by Bill Stoddard's avatar Bill Stoddard
Browse files

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
parent 41448ddb

Apache.dsw

+15 −0
Original line number Diff line number Diff line
@@ -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

}}}



###############################################################################

modules/aaa/mod_auth_digest.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

modules/aaa/mod_auth_digest.dsp

+2 −2
Original line number Diff line number Diff line
@@ -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"

support/htdigest.dsp

+4 −16
Original line number Diff line number Diff line
@@ -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

support/htpasswd.c

+2 −3
Original line number Diff line number Diff line
@@ -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>