Attached are the two files of the diffs, done with the u3 option. The
files in the flood-1.1 directory in this case are the originals and the
current directory contains the modified files.
I am providing a heads-up that I am experiencing issues, specifically on
the Windows platform, likely, with SSL server-side certificates, that are
not found when running Flood from the Unix (Solaris) platform. I will
provide Url and test files as a separate post.
-Norman Tuttle, OpenDemand Systems Developer, [EMAIL PROTECTED]
On Thu, 9 Oct 2003, William A. Rowe, Jr. wrote:
> Norman, we need the unified, diff -u3 results, as the regular diffs don't
> provide enough context. I'll review and commit in the morning if you
> would please repost.
>
> If your mailer wraps or distorts text, do not send inline, but please attach
> instead.
>
> Bill
>
> At 02:23 PM 10/9/2003, Norman Tuttle wrote:
> >email sent by Norman Tuttle, OpenDemand Systems Developer
> >([EMAIL PROTECTED])-
> >
> >Here are the diffs for flood.dsp needed in order to successfully build
> >Flood on Win32 using a Microsoft VC++ 6.0 Enterprise Compiler (MSDEV) - the
> >last email explains how I generated the diffs from our own CVS repository
> >(I did not do a diff for XLATE.C, which I explained was a problem in
> >Windows which needs to get iconv from the APR, since the fix I have
> >likely masks the real issue which is the missing definition of the
> >apr_iconv_t structure which appears within the conditional code in
> >XLATE.C); they go with change to Makefile.win outlined in part 1 of email:
> >
> >diff -r1.1.1.1 flood.dsp
> >10c10
> >< !MESSAGE
> >---
> >> !MESSAGE
> >12c12
> >< !MESSAGE
> >---
> >> !MESSAGE
> >15c15
> >< !MESSAGE
> >---
> >> !MESSAGE
> >17c17
> >< !MESSAGE
> >---
> >> !MESSAGE
> >19c19
> >< !MESSAGE
> >---
> >> !MESSAGE
> >22c22
> >< !MESSAGE
> >---
> >> !MESSAGE
> >45c45
> >< # ADD CPP /nologo /MD /W3 /O2 /I "$(APRPATH)\include" /I
> >"$(APRUTILPATH)\include" /I "$(OPENSSLPATH)\inc32" /D "NDEBUG" /D "WIN32"
> >/D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
> >"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
> >/Fd"Release/flood" /FD /c
> >---
> >> # ADD CPP /nologo /MD /W3 /O2 /I "$(APRPATH)\include" /I
> >"$(APRUTILPATH)\include" /I "$(SRCLIB)\apr-iconv\include" /D "NDEBUG" /D
> >"WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
> >"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
> >/Fd"Release/flood" /FD /c
> >53c53,54
> >< # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
> >aprutil.lib pcreposix.lib libeay32.lib ssleay32.lib /nologo
> >/subsystem:console /map /machine:I386 /libpath:"$(APRPATH)\LibR"
> >/libpath:"$(APRUTILPATH)\LibR" /libpath:"$(OPENSSLPATH)\$(SSLBIN)"
> >/libpath:"$(REGEXPATH)\LibR"
> >---
> >> # ADD LINK32 msvcrt.lib oldnames.lib kernel32.lib advapi32.lib
> >wsock32.lib ws2_32.lib apr.lib aprutil.lib apriconv.lib xml.lib
> >pcreposix.lib pcre.lib libeay32.lib ssleay32.lib /nologo
> >/subsystem:console /map /machine:I386 /nodefaultlib
> >/libpath:"$(APRPATH)\LibR" /libpath:"$(APRUTILPATH)\LibR"
> >/libpath:"$(REGEXPATH)\LibR"
> >> # SUBTRACT LINK32 /pdb:none
> >69c70
> >< # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "$(APRPATH)\include" /I
> >"$(APRUTILPATH)\include" /I "$(OPENSSLPATH)\inc32" /D "_DEBUG" /D "WIN32"
> >/D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
> >"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
> >/Fd"Debug/flood" /FD /c
> >---
> >> # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I
> >"C:\Work\openload\c\src\httpd-test\flood\apr-iconv\include" /I
> >"C:\Work\openload\c\src\httpd-test\flood\apr\include" /I
> >"c:\Work\openload\c\src\httpd-test\flood\apr-util\include" /D "_DEBUG" /D
> >"WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
> >"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
> >/Fd"Debug/flood" /FD /c
> >77c78,79
> >< # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
> >aprutil.lib pcreposix.lib libeay32.lib ssleay32.lib /nologo
> >/subsystem:console /incremental:no /map /debug /machine:I386
> >/libpath:"$(APRPATH)\LibD" /libpath:"$(APRUTILPATH)\LibD"
> >/libpath:"$(OPENSSLPATH)\$(SSLBIN)" /libpath:"$(REGEXPATH)\LibD"
> >---
> >> # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
> >apriconv.lib xml.lib pcreposix.lib pcre.lib libeay32.lib ssleay32.lib
> >aprutil.lib /nologo /subsystem:console /incremental:no /map /debug
> >/machine:I386 /libpath:"c:\Work\openload\c\httpd-test\flood"
> >> # SUBTRACT LINK32 /pdb:none
> >79c81
> >< !ENDIF
> >---
> >> !ENDIF
>
>
--- Makefile.win 2003-10-08 19:57:46.000000000 -0400
+++ \flood-1.1\Makefile.win 2002-05-31 03:57:16.000000000 -0400
@@ -17,7 +17,7 @@
#
# For example;
#
-# nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" install
+# nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
#
# Be aware that certain awk's will not accept backslahed names,
# so the server root should be given in forward slashes (quoted),
@@ -26,7 +26,7 @@
default: build
!IF "$(SRCLIB)" == ""
-SRCLIB=$(MAKEDIR)
+SRCLIB=$(MAKEDIR)\..\..\httpd-2.0\srclib
!MESSAGE Using default SRCLIB path $(SRCLIB)
!ENDIF
@@ -36,7 +36,7 @@
!ENDIF
!IF "$(APRUTILPATH)" == ""
-APRUTILPATH=$(SRCLIB)\apr-util
+APRUTILPATH=$(APRPATH)\..\apr-util
!MESSAGE Using default APRUTILPATH path $(APRUTILPATH)
!ENDIF
@@ -54,7 +54,7 @@
!MESSAGE Please check out or download and unpack the Apache Portability Runtime
!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory.
!MESSAGE flood cannot build without these libraries!
-!MESSAGE
+!MESSAGE
!ERROR Need $(APRPATH)
!ENDIF
@@ -62,7 +62,7 @@
!MESSAGE Please check out or download and unpack the Apache Portability Runtime
!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory.
!MESSAGE flood cannot build without these libraries!
-!MESSAGE
+!MESSAGE
!ERROR Need $(APRUTILPATH)
!ENDIF
@@ -70,7 +70,7 @@
!MESSAGE Please check out or download and unpack the pcre regex directory.
!MESSAGE One solution is the Apache 2.0 srclib/pcre distribution.
!MESSAGE flood cannot build without these libraries!
-!MESSAGE
+!MESSAGE
!ERROR Need $(REGEXPATH)
!ENDIF
@@ -117,21 +117,21 @@
# Yup, we are our own dependency, if this inline script changes
config.h: Makefile.win floodenv.bat config.h.in regex.h
- -awk -f <<script.awk config.h.in > config.h
+ -awk -f <<script.awk config.h.in > config.h
{
- sub( /@prngrand@/, "1" );
- sub( /@prngrand48@/, "0" );
- sub( /@prngrandom@/, "0" );
- sub( /@hasstrtoll@/, "0" );
- sub( /@hasstrtoq@/, "0" );
- sub( /@flood_has_openssl@/, "$(HAVE_SSL)" );
+ sub( /@prngrand@/, "1" );
+ sub( /@prngrand48@/, "0" );
+ sub( /@prngrandom@/, "0" );
+ sub( /@hasstrtoll@/, "0" );
+ sub( /@hasstrtoq@/, "0" );
+ sub( /@flood_has_openssl@/, "$(HAVE_SSL)" );
sub( /@flood_has_devrand@/, "0" );
sub( /@CAPATH@/, "certs" );
print $$0;
}
<<
-configure: config.h
+configure: config.h
!IFNDEF MAKEOPT
# Only default the behavior if MAKEOPT= is omitted
@@ -147,32 +147,37 @@
!IF EXIST("flood.mak")
clean:
+ -floodenv.bat
$(MAKE) $(MAKEOPT) -f flood.mak CFG="flood - Win32 $(LONG)" RECURSE=0
CLEAN
del config.h floodenv.bat regex.h
build: config.h
- echo $(MAKE) $(MAKEOPT) -f flood.mak CFG="flood - Win32 $(LONG)"
RECURSE=0 >> floodenv.bat
- -floodenv
+ floodenv.bat
+ $(MAKE) $(MAKEOPT) -f flood.mak CFG="flood - Win32 $(LONG)" RECURSE=0
!ELSEIF EXIST("flood.sln")
-clean:
+clean:
+ -floodenv.bat
devenv flood.sln /useenv /clean $(LONG) /project flood
del config.h floodenv.bat regex.h
build: config.h
- echo devenv flood.sln /useenv /build $(LONG) /project flood >>
floodenv.bat
- -floodenv
+ floodenv.bat
+ devenv flood.sln /useenv /build $(LONG) /project flood
!ELSE
-clean:
- msdev flood.dsw /USEENV /MAKE "flood - Win32 $(LONG)" /CLEAN
+clean:
+ -floodenv.bat
+ msdev flood.dsw /USEENV /MAKE \
+ "flood - Win32 $(LONG)" /CLEAN
del config.h floodenv.bat regex.h
build: config.h
- echo msdev flood.dsw /USEENV /MAKE "flood - Win32 $(LONG)" >>
floodenv.bat
- -floodenv
+ floodenv.bat
+ msdev flood.dsw /USEENV /MAKE \
+ "flood - Win32 $(LONG)"
!ENDIF
@@ -194,8 +199,8 @@
type << >> "$(INSTDIR)\README.txt"
This binary distribution includes cryptographic software written by
- Eric Young ([EMAIL PROTECTED]), software written by Tim Hudson
- ([EMAIL PROTECTED]), and software developed by the OpenSSL Project
+ Eric Young ([EMAIL PROTECTED]), software written by Tim Hudson
+ ([EMAIL PROTECTED]), and software developed by the OpenSSL Project
for use in the OpenSSL Toolkit <http://www.openssl.org/>.
<<
-awk -f <<script.awk < "$(OPENSSLPATH)\LICENSE" >>
"$(INSTDIR)\LICENSE.txt"
@@ -213,13 +218,13 @@
Apache flood Limited OpenSSL Distribution
This binary distribution includes the minimal components of OpenSSL required
- to support flood (details are listed in OPENSSL-README.txt.) For the complete
- list of CHANGES to this and later versions of OpenSSL, please refer to the
- definative source, <http://www.openssl.org/news/changelog.html>, or see the
- CHANGES file in the full binary or source distribution package
+ to support flood (details are listed in OPENSSL-README.txt.) For the
complete
+ list of CHANGES to this and later versions of OpenSSL, please refer to the
+ definative source, <http://www.openssl.org/news/changelog.html>, or see the
+ CHANGES file in the full binary or source distribution package
from <http://www.openssl.org/>.
- These OpenSSL binaries were built for distribution from the U.S. without
+ These OpenSSL binaries were built for distribution from the U.S. without
support for the patented encryption methods IDEA, MDC-2 or RC5.
--------------------------------------------------------------------------------
@@ -235,18 +240,18 @@
ssleay32.dll
These are the minimal libraries and tools required to use flood with HTTPS
- support for SSL v2/v3 and TLS v1. No library link files, headers or sources
- are distributed with this binary distribution. Please refer to the
+ support for SSL v2/v3 and TLS v1. No library link files, headers or sources
+ are distributed with this binary distribution. Please refer to the
<http://www.openssl.org/> site for complete source or binary distributions.
- These OpenSSL binaries were built for distribution from the U.S. without
+ These OpenSSL binaries were built for distribution from the U.S. without
support for the patented encryption methods IDEA, MDC-2 or RC5.
The Apache Projects only support the binary distribution of these files
and development of the flood program. We cannot provide support assistance
for using or configuring the OpenSSL package or these modules. Please refer
all installation and configuration questions to the appropriate forum,
- such as the user supported lists, <http://httpd.apache.org/userslist.html>
+ such as the user supported lists, <http://httpd.apache.org/userslist.html>
the Apache HTTP Server user's list or <http://www.openssl.org/support/> the
OpenSSL support page.
--- flood.dsp 2003-10-08 11:47:25.000000000 -0400
+++ \flood-1.1\flood.dsp 2002-06-05 02:25:20.000000000 -0400
@@ -7,19 +7,19 @@
CFG=flood - 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
!MESSAGE NMAKE /f "flood.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "flood.mak" CFG="flood - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "flood - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "flood - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "$(APRPATH)\include" /I
"$(APRUTILPATH)\include" /I "$(SRCLIB)\apr-iconv\include" /D "NDEBUG" /D
"WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /Fd"Release/flood"
/FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "$(APRPATH)\include" /I
"$(APRUTILPATH)\include" /I "$(OPENSSLPATH)\inc32" /D "NDEBUG" /D "WIN32" /D
"_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /Fd"Release/flood"
/FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,8 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib apr.lib
aprutil.lib /nologo /subsystem:console /map /machine:I386
-# ADD LINK32 msvcrt.lib oldnames.lib kernel32.lib advapi32.lib wsock32.lib
ws2_32.lib apr.lib aprutil.lib apriconv.lib xml.lib pcreposix.lib pcre.lib
libeay32.lib ssleay32.lib /nologo /subsystem:console /map /machine:I386
/nodefaultlib /libpath:"$(APRPATH)\LibR" /libpath:"$(APRUTILPATH)\LibR"
/libpath:"$(REGEXPATH)\LibR"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
aprutil.lib pcreposix.lib libeay32.lib ssleay32.lib /nologo /subsystem:console
/map /machine:I386 /libpath:"$(APRPATH)\LibR" /libpath:"$(APRUTILPATH)\LibR"
/libpath:"$(OPENSSLPATH)\$(SSLBIN)" /libpath:"$(REGEXPATH)\LibR"
!ELSEIF "$(CFG)" == "flood - Win32 Debug"
@@ -67,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I
"C:\Work\openload\c\src\httpd-test\flood\apr-iconv\include" /I
"C:\Work\openload\c\src\httpd-test\flood\apr\include" /I
"c:\Work\openload\c\src\httpd-test\flood\apr-util\include" /D "_DEBUG" /D
"WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /Fd"Debug/flood"
/FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "$(APRPATH)\include" /I
"$(APRUTILPATH)\include" /I "$(OPENSSLPATH)\inc32" /D "_DEBUG" /D "WIN32" /D
"_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /Fd"Debug/flood"
/FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -75,10 +74,9 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
aprutil.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
apriconv.lib xml.lib pcreposix.lib pcre.lib libeay32.lib ssleay32.lib
aprutil.lib /nologo /subsystem:console /incremental:no /map /debug
/machine:I386 /libpath:"c:\Work\openload\c\httpd-test\flood"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
aprutil.lib pcreposix.lib libeay32.lib ssleay32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386 /libpath:"$(APRPATH)\LibD"
/libpath:"$(APRUTILPATH)\LibD" /libpath:"$(OPENSSLPATH)\$(SSLBIN)"
/libpath:"$(REGEXPATH)\LibD"
-!ENDIF
+!ENDIF
# Begin Target
