Win32 Legacy build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@1816751 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index c3f75e6f268a84e1b5d06d4aa46710163d17ba07..191363158c22f15e5fcb9e19783112f47b5a185f 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -2086,6 +2086,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_md"=.\modules\md\mod_md.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Apache.dsw b/Apache.dsw
index 30866bc0d52c1d1a550353d97559241d62b78d2c..2a08ecdf451b21b2c847e834ee944db892fdd360 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -2485,6 +2485,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_md"=.\modules\md\mod_md.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/BuildBin.dsp b/BuildBin.dsp
index 173cffb97fba44ad006baabf607cce1c0b12fc62..155966454080f43f0938761bee6cf1451016bc18 100644 (file)
--- a/BuildBin.dsp
+++ b/BuildBin.dsp
@@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"

diff --git a/Makefile.win b/Makefile.win
index 3444cca4280c9c97fd5d4f130fcfe39d304b716f..705b643c226bce70a49454279bd1a06174f6d7ae 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -295,6 +295,30 @@ _trybrotli:
 
 !ENDIF
 
+!IF EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl")
+
+_trymd:
+!IF $(USEMAK) == 1
+       cd modules\md
+       $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
+!ELSEIF $(USESLN) == 1
+       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_md
+!ELSE
+       @msdev $(TLP).dsw /USEENV /MAKE \
+               "mod_md - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+#     NOT EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl")
+
+_trymd:
+       @echo -----
+       @echo mod_md will not build unless OpenSSL, Jansson and Curl are built and placed
+       @echo in srclib. Example: srclib/openssl, srclib/jansson and srclib/curl
+
+!ENDIF
+
 _trydb:
 !IF $(USEMAK) == 1
        cd srclib\$(UTILDIR)\dbd
@@ -586,6 +610,11 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_userdir.mak     CFG="mod_userdir - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_vhost_alias.mak CFG="mod_vhost_alias - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
+!IF EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl")
+       cd modules\md
+        $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak          CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
+!ENDIF
        cd modules\metadata
         $(MAKE) $(MAKEOPT) -f mod_cern_meta.mak   CFG="mod_cern_meta - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_env.mak         CFG="mod_env - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -871,6 +900,16 @@ _copybin:
        copy modules\mappers\$(LONG)\mod_speling.$(src_so)      "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_userdir.$(src_so)      "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_vhost_alias.$(src_so)  "$(inst_so)" <.y
+!IF EXIST("srclib\openssl") &&  EXIST("srclib\jansson") &&  EXIST("srclib\curl")
+       copy modules\md\$(LONG)\mod_md.$(src_so)                "$(inst_so)" <.y
+!IF "$(SHORT)" == "D"
+       -copy srclib\curl\bin\libcurl_debug.$(src_dll)          "$(inst_dll)" <.y
+       -copy srclib\jansson\bin\jansson_d.$(src_dll)           "$(inst_dll)" <.y
+!ELSE
+       -copy srclib\curl\bin\libcurl.$(src_dll)                "$(inst_dll)" <.y
+       -copy srclib\jansson\bin\jansson.$(src_dll)             "$(inst_dll)" <.y
+!ENDIF
+!ENDIF
        copy modules\metadata\$(LONG)\mod_cern_meta.$(src_so)   "$(inst_so)" <.y
        copy modules\metadata\$(LONG)\mod_env.$(src_so)         "$(inst_so)" <.y
        copy modules\metadata\$(LONG)\mod_expires.$(src_so)     "$(inst_so)" <.y

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index 05f519b4805cb15770e6507fca2f8aa180109a5d..ab64b2daa411d6680daf1259ba99f2625c522043 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -156,6 +156,7 @@ BEGIN {
           print "#LoadModule log_debug_module modules/mod_log_debug.so" > dstfl;
           print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl;
           print "#LoadModule lua_module modules/mod_lua.so" > dstfl;
+          print "#LoadModule md_module modules/mod_md.so" > dstfl;
           print "#LoadModule macro_module modules/mod_macro.so" > dstfl;
           print "LoadModule mime_module modules/mod_mime.so" > dstfl;
           print "#LoadModule mime_magic_module modules/mod_mime_magic.so" > dstfl;

diff --git a/modules/md/mod_md.dep b/modules/md/mod_md.dep
new file mode 100644 (file)
index 0000000..0cbd691
--- /dev/null
+++ b/modules/md/mod_md.dep
@@ -0,0 +1,5 @@
+# Microsoft Developer Studio Generated Dependency File, included by mod_md.mak\r
+\r
+..\..\build\win32\httpd.rc : \\r
+       "..\..\include\ap_release.h"\\r
+       \r

diff --git a/modules/md/mod_md.dsp b/modules/md/mod_md.dsp
index edc7f859c86fa964a89e051ab94115c595cb9ef7..c685f540439978f8ef61e7001d23905708d0618d 100644 (file)
--- a/modules/md/mod_md.dsp
+++ b/modules/md/mod_md.dsp
@@ -85,7 +85,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_md.so" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so\r
-# ADD LINK32 kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib ssleay32.lib libeay32.lib jansson_d.lib libcurl.lib /nologo /subsystem:windows /dll /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /incremental:no /debug /out:".\Debug\mod_md.so" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so\r
+# ADD LINK32 kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib ssleay32.lib libeay32.lib jansson_d.lib libcurl_debug.lib /nologo /subsystem:windows /dll /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /incremental:no /debug /out:".\Debug\mod_md.so" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so\r
 # Begin Special Build Tool\r
 TargetPath=.\Debug\mod_md.so\r
 SOURCE="$(InputPath)"\r

diff --git a/modules/md/mod_md.mak b/modules/md/mod_md.mak
new file mode 100644 (file)
index 0000000..9d5881e
--- /dev/null
+++ b/modules/md/mod_md.mak
@@ -0,0 +1,520 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on mod_md.dsp\r
+!IF "$(CFG)" == ""\r
+CFG=mod_md - Win32 Release\r
+!MESSAGE No configuration specified. Defaulting to mod_md - Win32 Release.\r
+!ENDIF \r
+\r
+!IF "$(CFG)" != "mod_md - Win32 Release" && "$(CFG)" != "mod_md - Win32 Debug"\r
+!MESSAGE Invalid configuration "$(CFG)" specified.\r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "mod_md.mak" CFG="mod_md - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "mod_md - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "mod_md - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+!ERROR An invalid configuration is specified.\r
+!ENDIF \r
+\r
+!IF "$(OS)" == "Windows_NT"\r
+NULL=\r
+!ELSE \r
+NULL=nul\r
+!ENDIF \r
+\r
+!IF "$(_HAVE_OSSL110)" == "1"\r
+SSLCRP=libcrypto\r
+SSLLIB=libssl\r
+SSLINC=/I ../../srclib/openssl/include\r
+SSLBIN=/libpath:../../srclib/openssl\r
+!ELSE \r
+SSLCRP=libeay32\r
+SSLLIB=ssleay32\r
+SSLINC=/I ../../srclib/openssl/inc32\r
+SSLBIN=/libpath:../../srclib/openssl/out32dll\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_md - Win32 Release"\r
+\r
+OUTDIR=.\Release\r
+INTDIR=.\Release\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+!IF "$(RECURSE)" == "0" \r
+\r
+ALL : "$(OUTDIR)\mod_md.so"\r
+\r
+!ELSE \r
+\r
+ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_md.so"\r
+\r
+!ENDIF \r
+\r
+!IF "$(RECURSE)" == "1" \r
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" \r
+!ELSE \r
+CLEAN :\r
+!ENDIF \r
+       -@erase "$(INTDIR)\md_acme.obj"\r
+       -@erase "$(INTDIR)\md_acme_acct.obj"\r
+       -@erase "$(INTDIR)\md_acme_authz.obj"\r
+       -@erase "$(INTDIR)\md_acme_drive.obj"\r
+       -@erase "$(INTDIR)\md_core.obj"\r
+       -@erase "$(INTDIR)\md_crypt.obj"\r
+       -@erase "$(INTDIR)\md_curl.obj"\r
+       -@erase "$(INTDIR)\md_http.obj"\r
+       -@erase "$(INTDIR)\md_json.obj"\r
+       -@erase "$(INTDIR)\md_jws.obj"\r
+       -@erase "$(INTDIR)\md_log.obj"\r
+       -@erase "$(INTDIR)\md_reg.obj"\r
+       -@erase "$(INTDIR)\md_store.obj"\r
+       -@erase "$(INTDIR)\md_store_fs.obj"\r
+       -@erase "$(INTDIR)\md_util.obj"\r
+       -@erase "$(INTDIR)\mod_md.obj"\r
+       -@erase "$(INTDIR)\mod_md.res"\r
+       -@erase "$(INTDIR)\mod_md_config.obj"\r
+       -@erase "$(INTDIR)\mod_md_os.obj"\r
+       -@erase "$(INTDIR)\mod_md_src.idb"\r
+       -@erase "$(INTDIR)\mod_md_src.pdb"\r
+       -@erase "$(OUTDIR)\mod_md.exp"\r
+       -@erase "$(OUTDIR)\mod_md.lib"\r
+       -@erase "$(OUTDIR)\mod_md.pdb"\r
+       -@erase "$(OUTDIR)\mod_md.so"\r
+\r
+"$(OUTDIR)" :\r
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+CPP=cl.exe\r
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../server/mpm/winnt" /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /I "../../srclib/jansson/include" /I "../../srclib/curl/include" /I "../ssl" /I "../core" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ssize_t=long /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_md_src" /FD /I " ../ssl" /c \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+MTL=midl.exe\r
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
+RSC=rc.exe\r
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME=mod_md.so /d LONG_NAME=Letsencrypt module for Apache \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_md.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib $(SSLCRP).lib $(SSLLIB).lib jansson.lib libcurl.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_md.pdb" /debug  /out:"$(OUTDIR)\mod_md.so" /implib:"$(OUTDIR)\mod_md.lib" /libpath:"../../srclib/apr/Release" /libpath:"../../srclib/apr-util/Release" /libpath:"../../Release/" $(SSLBIN) /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so /opt:ref \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\mod_md.obj" \\r
+       "$(INTDIR)\mod_md_config.obj" \\r
+       "$(INTDIR)\mod_md_os.obj" \\r
+       "$(INTDIR)\md_core.obj" \\r
+       "$(INTDIR)\md_crypt.obj" \\r
+       "$(INTDIR)\md_curl.obj" \\r
+       "$(INTDIR)\md_http.obj" \\r
+       "$(INTDIR)\md_json.obj" \\r
+       "$(INTDIR)\md_jws.obj" \\r
+       "$(INTDIR)\md_log.obj" \\r
+       "$(INTDIR)\md_reg.obj" \\r
+       "$(INTDIR)\md_store.obj" \\r
+       "$(INTDIR)\md_store_fs.obj" \\r
+       "$(INTDIR)\md_util.obj" \\r
+       "$(INTDIR)\md_acme.obj" \\r
+       "$(INTDIR)\md_acme_acct.obj" \\r
+       "$(INTDIR)\md_acme_authz.obj" \\r
+       "$(INTDIR)\md_acme_drive.obj" \\r
+       "$(INTDIR)\mod_md.res" \\r
+       "..\..\srclib\apr\Release\libapr-1.lib" \\r
+       "..\..\srclib\apr-util\Release\libaprutil-1.lib" \\r
+       "..\..\Release\libhttpd.lib"\r
+\r
+"$(OUTDIR)\mod_md.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+TargetPath=.\Release\mod_md.so\r
+SOURCE="$(InputPath)"\r
+PostBuild_Desc=Embed .manifest\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+\r
+ALL : $(DS_POSTBUILD_DEP)\r
+\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+$(DS_POSTBUILD_DEP) : "libhttpd - Win32 Release" "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_md.so"\r
+   if exist .\Release\mod_md.so.manifest mt.exe -manifest .\Release\mod_md.so.manifest -outputresource:.\Release\mod_md.so;2\r
+       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_md - Win32 Debug"\r
+\r
+OUTDIR=.\Debug\r
+INTDIR=.\Debug\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+!IF "$(RECURSE)" == "0" \r
+\r
+ALL : "$(OUTDIR)\mod_md.so"\r
+\r
+!ELSE \r
+\r
+ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_md.so"\r
+\r
+!ENDIF \r
+\r
+!IF "$(RECURSE)" == "1" \r
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" \r
+!ELSE \r
+CLEAN :\r
+!ENDIF \r
+       -@erase "$(INTDIR)\md_acme.obj"\r
+       -@erase "$(INTDIR)\md_acme_acct.obj"\r
+       -@erase "$(INTDIR)\md_acme_authz.obj"\r
+       -@erase "$(INTDIR)\md_acme_drive.obj"\r
+       -@erase "$(INTDIR)\md_core.obj"\r
+       -@erase "$(INTDIR)\md_crypt.obj"\r
+       -@erase "$(INTDIR)\md_curl.obj"\r
+       -@erase "$(INTDIR)\md_http.obj"\r
+       -@erase "$(INTDIR)\md_json.obj"\r
+       -@erase "$(INTDIR)\md_jws.obj"\r
+       -@erase "$(INTDIR)\md_log.obj"\r
+       -@erase "$(INTDIR)\md_reg.obj"\r
+       -@erase "$(INTDIR)\md_store.obj"\r
+       -@erase "$(INTDIR)\md_store_fs.obj"\r
+       -@erase "$(INTDIR)\md_util.obj"\r
+       -@erase "$(INTDIR)\mod_md.obj"\r
+       -@erase "$(INTDIR)\mod_md.res"\r
+       -@erase "$(INTDIR)\mod_md_config.obj"\r
+       -@erase "$(INTDIR)\mod_md_os.obj"\r
+       -@erase "$(INTDIR)\mod_md_src.idb"\r
+       -@erase "$(INTDIR)\mod_md_src.pdb"\r
+       -@erase "$(OUTDIR)\mod_md.exp"\r
+       -@erase "$(OUTDIR)\mod_md.lib"\r
+       -@erase "$(OUTDIR)\mod_md.pdb"\r
+       -@erase "$(OUTDIR)\mod_md.so"\r
+\r
+"$(OUTDIR)" :\r
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+CPP=cl.exe\r
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /I "../../srclib/jansson/include" /I "../../srclib/curl/include" /I "../core" /I "../ssl" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ssize_t=long /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_md_src" /FD /EHsc /c \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+MTL=midl.exe\r
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
+RSC=rc.exe\r
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME=mod_md.so /d LONG_NAME=http2_module for Apache \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_md.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=kernel32.lib libhttpd.lib libapr-1.lib libaprutil-1.lib $(SSLCRP).lib $(SSLLIB).lib jansson_d.lib libcurl_debug.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_md.pdb" /debug  /out:"$(OUTDIR)\mod_md.so" /implib:"$(OUTDIR)\mod_md.lib" $(SSLBIN) /libpath:"../../srclib/jansson/lib" /libpath:"../../srclib/curl/lib" /base:@..\..\os\win32\BaseAddr.ref,mod_md.so \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\mod_md.obj" \\r
+       "$(INTDIR)\mod_md_config.obj" \\r
+       "$(INTDIR)\mod_md_os.obj" \\r
+       "$(INTDIR)\md_core.obj" \\r
+       "$(INTDIR)\md_crypt.obj" \\r
+       "$(INTDIR)\md_curl.obj" \\r
+       "$(INTDIR)\md_http.obj" \\r
+       "$(INTDIR)\md_json.obj" \\r
+       "$(INTDIR)\md_jws.obj" \\r
+       "$(INTDIR)\md_log.obj" \\r
+       "$(INTDIR)\md_reg.obj" \\r
+       "$(INTDIR)\md_store.obj" \\r
+       "$(INTDIR)\md_store_fs.obj" \\r
+       "$(INTDIR)\md_util.obj" \\r
+       "$(INTDIR)\md_acme.obj" \\r
+       "$(INTDIR)\md_acme_acct.obj" \\r
+       "$(INTDIR)\md_acme_authz.obj" \\r
+       "$(INTDIR)\md_acme_drive.obj" \\r
+       "$(INTDIR)\mod_md.res" \\r
+       "..\..\srclib\apr\Debug\libapr-1.lib" \\r
+       "..\..\srclib\apr-util\Debug\libaprutil-1.lib" \\r
+       "..\..\Debug\libhttpd.lib"\r
+\r
+"$(OUTDIR)\mod_md.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+TargetPath=.\Debug\mod_md.so\r
+SOURCE="$(InputPath)"\r
+PostBuild_Desc=Embed .manifest\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+\r
+ALL : $(DS_POSTBUILD_DEP)\r
+\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+$(DS_POSTBUILD_DEP) : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_md.so"\r
+   if exist .\Debug\mod_md.so.manifest mt.exe -manifest .\Debug\mod_md.so.manifest -outputresource:.\Debug\mod_md.so;2\r
+       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"\r
+\r
+!ENDIF \r
+\r
+\r
+!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
+!IF EXISTS("mod_md.dep")\r
+!INCLUDE "mod_md.dep"\r
+!ELSE \r
+!MESSAGE Warning: cannot find "mod_md.dep"\r
+!ENDIF \r
+!ENDIF \r
+\r
+\r
+!IF "$(CFG)" == "mod_md - Win32 Release" || "$(CFG)" == "mod_md - Win32 Debug"\r
+\r
+!IF  "$(CFG)" == "mod_md - Win32 Release"\r
+\r
+"libapr - Win32 Release" : \r
+   cd "..\..\srclib\apr"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" \r
+   cd "..\..\modules\md"\r
+\r
+"libapr - Win32 ReleaseCLEAN" : \r
+   cd "..\..\srclib\apr"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN \r
+   cd "..\..\modules\md"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_md - Win32 Debug"\r
+\r
+"libapr - Win32 Debug" : \r
+   cd "..\..\srclib\apr"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" \r
+   cd "..\..\modules\md"\r
+\r
+"libapr - Win32 DebugCLEAN" : \r
+   cd "..\..\srclib\apr"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN \r
+   cd "..\..\modules\md"\r
+\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_md - Win32 Release"\r
+\r
+"libaprutil - Win32 Release" : \r
+   cd "..\..\srclib\apr-util"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" \r
+   cd "..\..\modules\md"\r
+\r
+"libaprutil - Win32 ReleaseCLEAN" : \r
+   cd "..\..\srclib\apr-util"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN \r
+   cd "..\..\modules\md"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_md - Win32 Debug"\r
+\r
+"libaprutil - Win32 Debug" : \r
+   cd "..\..\srclib\apr-util"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" \r
+   cd "..\..\modules\md"\r
+\r
+"libaprutil - Win32 DebugCLEAN" : \r
+   cd "..\..\srclib\apr-util"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN \r
+   cd "..\..\modules\md"\r
+\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_md - Win32 Release"\r
+\r
+"libhttpd - Win32 Release" : \r
+   cd "..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" \r
+   cd ".\modules\md"\r
+\r
+"libhttpd - Win32 ReleaseCLEAN" : \r
+   cd "..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" RECURSE=1 CLEAN \r
+   cd ".\modules\md"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_md - Win32 Debug"\r
+\r
+"libhttpd - Win32 Debug" : \r
+   cd "..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" \r
+   cd ".\modules\md"\r
+\r
+"libhttpd - Win32 DebugCLEAN" : \r
+   cd "..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" RECURSE=1 CLEAN \r
+   cd ".\modules\md"\r
+\r
+!ENDIF \r
+\r
+SOURCE=..\..\build\win32\httpd.rc\r
+\r
+!IF  "$(CFG)" == "mod_md - Win32 Release"\r
+\r
+\r
+"$(INTDIR)\mod_md.res" : $(SOURCE) "$(INTDIR)"\r
+       $(RSC) /l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_md.so" /d LONG_NAME="md_module for Apache" $(SOURCE)\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "mod_md - Win32 Debug"\r
+\r
+\r
+"$(INTDIR)\mod_md.res" : $(SOURCE) "$(INTDIR)"\r
+       $(RSC) /l 0x409 /fo"$(INTDIR)\mod_md.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_md.so" /d LONG_NAME="md_module for Apache" $(SOURCE)\r
+\r
+\r
+!ENDIF \r
+\r
+SOURCE=./md_acme.c\r
+\r
+"$(INTDIR)\md_acme.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_acme_acct.c\r
+\r
+"$(INTDIR)\md_acme_acct.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_acme_authz.c\r
+\r
+"$(INTDIR)\md_acme_authz.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_acme_drive.c\r
+\r
+"$(INTDIR)\md_acme_drive.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_core.c\r
+\r
+"$(INTDIR)\md_core.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_crypt.c\r
+\r
+"$(INTDIR)\md_crypt.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_curl.c\r
+\r
+"$(INTDIR)\md_curl.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_http.c\r
+\r
+"$(INTDIR)\md_http.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_json.c\r
+\r
+"$(INTDIR)\md_json.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_jws.c\r
+\r
+"$(INTDIR)\md_jws.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_log.c\r
+\r
+"$(INTDIR)\md_log.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_reg.c\r
+\r
+"$(INTDIR)\md_reg.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_store.c\r
+\r
+"$(INTDIR)\md_store.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_store_fs.c\r
+\r
+"$(INTDIR)\md_store_fs.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./md_util.c\r
+\r
+"$(INTDIR)\md_util.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./mod_md.c\r
+\r
+"$(INTDIR)\mod_md.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./mod_md_config.c\r
+\r
+"$(INTDIR)\mod_md_config.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./mod_md_os.c\r
+\r
+"$(INTDIR)\mod_md_os.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+\r
+!ENDIF \r
+\r

diff --git a/modules/ssl/mod_ssl.dsp b/modules/ssl/mod_ssl.dsp
index 72af2936ceffecce2c66923be9a09d46f4373678..65b554d58e2c2fde60d96b28e5152062bc154de8 100644 (file)
--- a/modules/ssl/mod_ssl.dsp
+++ b/modules/ssl/mod_ssl.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Release\mod_ssl_src" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /I "../md" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Release\mod_ssl_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Debug\mod_ssl_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /I "../md" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fd"Debug\mod_ssl_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/modules/ssl/mod_ssl.mak b/modules/ssl/mod_ssl.mak
index 03476ab38c62f964bce5a10954c545482acdfb08..ea771955ee8de779a52389f7b2aaf4ee682d00b4 100644 (file)
--- a/modules/ssl/mod_ssl.mak
+++ b/modules/ssl/mod_ssl.mak
@@ -90,7 +90,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../md" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -224,7 +224,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c 
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../md" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index db0144bfae52af4bcdc2ba2e1a4446318dffa0a4..49bcfcd633c9e39b63af0c693676cea11284f730 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -130,3 +130,4 @@ mod_proxy_hcheck.so         0x70C10000    0x00020000
 mod_proxy_http2.so          0x70C30000    0x00020000
 mod_http2.so                0x70C50000    0x00040000
 mod_brotli.so               0x70C90000    0x000C0000
+mod_md.so                   0x70D50000    0x00020000