httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 ApacheModuleAuthDigest.dsp BaseAddr.ref
Date Fri, 21 Apr 2000 22:12:44 GMT
stoddard    00/04/21 15:12:43

  Modified:    src      CHANGES Makefile.win
               src/lib/apr aprlib.def aprlib.dsp
               src/lib/apr/misc/win32 rand.c
               src/modules/standard mod_auth_digest.c
               src/os/win32 BaseAddr.ref
  Added:       src/os/win32 ApacheModuleAuthDigest.dsp
  Log:
  Win32: Get mod_auth_digest compiling and added to the Windows
  build environment. Not tested and I'd be suprised if it
  actually works.
  
  Revision  Changes    Path
  1.77      +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- CHANGES	2000/04/20 19:28:03	1.76
  +++ CHANGES	2000/04/21 22:12:37	1.77
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a3-dev
  +  *) Win32: Get mod_auth_digest compiling and added to the Windows
  +     build environment. Not tested and I'd be suprised if it 
  +     actually works. [Bill Stoddard]
  +
     *) Revamp the Win32 make environment. Makefiles have been removed and
        Apache.dsw created to bring together all the pieces. Create new file
        os/win32/BaseAddr.ref to define module base addresses (to prevent
  
  
  
  1.11      +2 -0      apache-2.0/src/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.win,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.win	2000/04/21 20:51:39	1.10
  +++ Makefile.win	2000/04/21 22:12:38	1.11
  @@ -79,6 +79,7 @@
            nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak
RECURSE=0 $(CTARGET)
   #        nmake /nologo CFG"=ApacheModuleInfo - Win32 $(LONG)" -f ApacheModuleInfo.mak RECURSE=0
$(CTARGET)
   	 nmake /nologo CFG="ApacheModuleAuthAnon - Win32 $(LONG)" -f ApacheModuleAuthAnon.mak
RECURSE=0 $(CTARGET)
  +	 nmake /nologo CFG="ApacheModuleAuthDigest - Win32 $(LONG)" -f ApacheModuleAuthDigest.mak
RECURSE=0 $(CTARGET)
   	 nmake /nologo CFG="ApacheModuleCERNMeta - Win32 $(LONG)" -f ApacheModuleCERNMeta.mak
RECURSE=0 $(CTARGET)
   	 nmake /nologo CFG="ApacheModuleExpires - Win32 $(LONG)" -f ApacheModuleExpires.mak RECURSE=0
$(CTARGET)
   	 nmake /nologo CFG="ApacheModuleHeaders - Win32 $(LONG)" -f ApacheModuleHeaders.mak RECURSE=0
$(CTARGET)
  @@ -102,6 +103,7 @@
           copy os\win32\ApacheModuleStatus$(SHORT)\ApacheModuleStatus.dll $(INSTDIR)\modules
   #       copy os\win32\ApacheModuleInfo$(SHORT)\ApacheModuleInfo.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleAuthAnon$(SHORT)\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
  +	copy os\win32\ApacheModuleAuthDigest$(SHORT)\ApacheModuleAuthDigest.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleCERNMeta$(SHORT)\ApacheModuleCERNMeta.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleExpires$(SHORT)\ApacheModuleExpires.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleHeaders$(SHORT)\ApacheModuleHeaders.dll $(INSTDIR)\modules
  
  
  
  1.22      +1 -0      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- aprlib.def	2000/04/20 19:28:04	1.21
  +++ aprlib.def	2000/04/21 22:12:39	1.22
  @@ -246,3 +246,4 @@
   	ap_day_snames @225
   	ap_canonical_error @226
   	ap_strerror @227
  +	ap_generate_random_bytes @228
  
  
  
  1.20      +4 -0      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- aprlib.dsp	2000/04/21 19:32:11	1.19
  +++ aprlib.dsp	2000/04/21 22:12:40	1.20
  @@ -182,6 +182,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\misc\win32\rand.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\file_io\win32\readwrite.c
   # End Source File
   # Begin Source File
  
  
  
  1.2       +2 -0      apache-2.0/src/lib/apr/misc/win32/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/rand.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rand.c	2000/04/15 19:05:13	1.1
  +++ rand.c	2000/04/21 22:12:40	1.2
  @@ -52,6 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  +#include "apr_config.h"
  +#include "apr_general.h"
   #include <wincrypt.h>
   
   ap_status_t ap_generate_random_bytes(unsigned char * buf, int length) 
  
  
  
  1.11      +3 -1      apache-2.0/src/modules/standard/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_auth_digest.c	2000/04/15 19:05:13	1.10
  +++ mod_auth_digest.c	2000/04/21 22:12:41	1.11
  @@ -84,7 +84,9 @@
    *   - expired nonces give amaya fits.  
    */
   
  +#ifndef WIN32
   #include "ap_config_auto.h"
  +#endif
   #include "httpd.h"
   #include "http_config.h"
   #include "http_conf_globals.h"
  @@ -257,7 +259,7 @@
   	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, 0, s,
   		     "Digest: error generating secret: %s", 
   		     /*ap_strerror(status)*/ "need ap_strerror here");
  -	exit(EXIT_FAILURE);
  +	exit(1);
       }
   
       ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "Digest: done");
  
  
  
  1.2       +1 -1      apache-2.0/src/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/BaseAddr.ref,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseAddr.ref	2000/04/20 19:28:08	1.1
  +++ BaseAddr.ref	2000/04/21 22:12:43	1.2
  @@ -13,7 +13,7 @@
   ApacheCore           0x6FF00000    0x000A0000
   mod_auth_anon        0x6FEF0000    0x00010000
   mod_cern_meta        0x6FEE0000    0x00010000
  -mod_digest           0x6FED0000    0x00010000
  +mod_auth_digest      0x6FED0000    0x00010000
   mod_expires          0x6FEC0000    0x00010000
   mod_headers          0x6FEB0000    0x00010000
   mod_info             0x6FEA0000    0x00010000
  
  
  
  1.1                  apache-2.0/src/os/win32/ApacheModuleAuthDigest.dsp
  
  Index: ApacheModuleAuthDigest.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="ApacheModuleAuthDigest" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=ApacheModuleAuthDigest - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "ApacheModuleAuthDigest.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "ApacheModuleAuthDigest.mak"\
   CFG="ApacheModuleAuthDigest - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "ApacheModuleAuthDigest - Win32 Release" (based on\
   "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "ApacheModuleAuthDigest - Win32 Debug" (based on\
   "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir ".\ApacheModuleAuthDigestR"
  # PROP Intermediate_Dir ".\ApacheModuleAuthDigestR"
  # 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 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"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # 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:windows
/dll /machine:I386
  # ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map
/machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  
  !ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir ".\ApacheModuleAuthDigestD"
  # PROP Intermediate_Dir ".\ApacheModuleAuthDigestD"
  # 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 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"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # 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:windows
/dll /debug /machine:I386 /pdbtype:sept
  # ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map
/debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  
  !ENDIF 
  
  # Begin Target
  
  # Name "ApacheModuleAuthDigest - Win32 Release"
  # Name "ApacheModuleAuthDigest - Win32 Debug"
  # Begin Source File
  
  SOURCE=..\..\modules\standard\mod_auth_digest.c
  # End Source File
  # End Target
  # End Project
  
  
  

Mime
View raw message