Commit 4e7af65f authored by Stefan Eissing's avatar Stefan Eissing
Browse files

merge of protocols + http2 relevant changes 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701655 13f79535-47bb-0310-9956-ffa450edef68
parent aa5165ae

Apache-apr2.dsw

+18 −0
Original line number Diff line number Diff line
@@ -1723,6 +1723,24 @@ Package=<4> 


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



Project: "mod_h2"=.\modules\http2\mod_h2.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_headers"=.\modules\metadata\mod_headers.dsp - Package Owner=<4>



Package=<5>

Apache.dsw

+21 −0
Original line number Diff line number Diff line
@@ -2041,6 +2041,27 @@ Package=<4> 


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



Project: "mod_h2"=.\modules\http2\mod_h2.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_headers"=.\modules\metadata\mod_headers.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 _dummy"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _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 _dummy"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy"

# PROP Rebuild_Opt ""

# PROP Target_File "\Apache2\bin\httpd.exe"

# PROP Bsc_Name ".\Browse\httpd.bsc"

CHANGES

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



Changes with Apache 2.4.17

  *) mod_h2: added donated http/2 implementation to build system. Similar

     configuration options to mod_ssl. [Stefan Eissing]



  *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting

     ';' as an alternate separator.  PR47241.

Makefile.win

+32 −0
Original line number Diff line number Diff line
@@ -215,6 +215,30 @@ _trylua: 


!ENDIF



!IF EXIST("srclib\nghttp2")



_trynghttp2:

!IF $(USEMAK) == 1

	cd modules\http2

	$(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..

!ELSEIF $(USESLN) == 1

	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2

!ELSE

	@msdev $(TLP).dsw /USEENV /MAKE \

		"mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF



!ELSE

#     NOT EXIST("srclib\lua")



_trynghttp2:

	@echo -----

	@echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2.

	@echo Version 1.0 includes an lib\makefile.msvc that will satisfy this

	@echo requirement.



!ENDIF



_trydb:

!IF $(USEMAK) == 1
@@ -754,6 +778,14 @@ _copybin: 
	copy modules\generators\$(LONG)\mod_info.$(src_so) 	"$(inst_so)" <.y

	copy modules\generators\$(LONG)\mod_status.$(src_so) 	"$(inst_so)" <.y

	copy modules\http\$(LONG)\mod_mime.$(src_so) 		"$(inst_so)" <.y

!IF EXIST("srclib\nghttp2")

	copy modules\http2\$(LONG)\mod_h2.$(src_so) 		"$(inst_so)" <.y

!IF "$(SHORT)" == "D"

	copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll)		 	"$(inst_dll)" <.y

!ELSE

	copy srclib\nghttp2\lib\MSVC_obj\nghttp2.$(src_dll)		 	"$(inst_dll)" <.y

!ENDIF

!ENDIF

	copy modules\ldap\$(LONG)\mod_ldap.$(src_so)		"$(inst_so)" <.y

	copy modules\loggers\$(LONG)\mod_log_config.$(src_so) 	"$(inst_so)" <.y

	copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) 	"$(inst_so)" <.y