Commit a12da22b authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the 2.4.x branch: 

 Merged /httpd/httpd/branches/2.4.x-mod_md:r1816423-1821089
   Merged /httpd/httpd/trunk:r1804530-1804531,1804542,1804545,1804671,1804759,1804787,1804975,1805180,1805192,1805194,1805256,1805294,1805373,1806939,1807228,1807347,1807577,1807593,1807774,1807777,1808005,1808092,1808100,1808241-1808243,1808249,1808444,1809719,1809888,1810723,1811082,1811812,1812193,1812517-1812518,1812999,1813642,1814720,1814939,1815005,1815078,1815264,1815370,1815483,1816055,1816154,1816156,1816552,1816558,1816970,1817023,1817777,1817785,1818120,1818122,1818308,1818725,1818792,1818849

Merged mod_md from trunk via 2.4.x-mod_md branch.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1821093 13f79535-47bb-0310-9956-ffa450edef68
parents 1510a90f 5f15f82b

Apache-apr2.dsw

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

Apache.dsw

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

BuildBin.dsp

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

CHANGES

+5 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.30

 

  *) mod_md: new experimental, module for managing domains across virtual hosts,

     implementing the Let's Encrypt ACMEv1 protocol to signup and renew 

     certificates. Please read the modules documentation for further instructions

     on how to use it. [Stefan Eissing]

  

  *) mod_proxy_html: skip documents shorter than 4 bytes

     PR 56286 [Micha Lenk <micha lenk info>]

Makefile.win

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