add mod_proxy_http2 to traditional windows build

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

7 files changed, 701 insertions, 6 deletions

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 3fbc62d2b8..2b65979300 100644
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -2348,6 +2348,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_http2"=.\modules\http2\mod_proxy_http2.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
+    Begin Project Dependency
+    Project_Dep_Name mod_http2
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_proxy_scgi"=.\modules\proxy\mod_proxy_scgi.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/Apache.dsw b/Apache.dsw
index a77b870a61..20259d25b6 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -2759,6 +2759,33 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_http2"=.\modules\http2\mod_proxy_http2.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
+    Begin Project Dependency
+    Project_Dep_Name mod_http2
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_proxy_scgi"=.\modules\proxy\mod_proxy_scgi.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/Makefile.win b/Makefile.win
index f6a82e5b5e..d3cb5c52f7 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -220,13 +220,17 @@ _trylua:
 _trynghttp2:
 !IF $(USEMAK) == 1
 	cd modules\http2
-	$(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	$(MAKE) $(MAKEOPT) -f mod_http2.mak       CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	$(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
 !ELSEIF $(USESLN) == 1
 	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2
+	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_http2
 !ELSE
 	@msdev $(TLP).dsw /USEENV /MAKE \
 		"mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+	@msdev $(TLP).dsw /USEENV /MAKE \
+		"mod_proxy_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
 !ELSE
@@ -506,11 +510,6 @@ _build:
 	cd modules\http
 	 $(MAKE) $(MAKEOPT) -f mod_mime.mak        CFG="mod_mime - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
-!IF EXIST("srclib\nghttp2")
-	cd modules\http2
-	 $(MAKE) $(MAKEOPT) -f mod_http2.mak         CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	cd ..\..
-!ENDIF
 	cd modules\loggers
 	 $(MAKE) $(MAKEOPT) -f mod_log_config.mak  CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_log_debug.mak  CFG="mod_log_debug - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -564,6 +563,13 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_bytraffic.mak  CFG="mod_lbmethod_bytraffic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_heartbeat.mak  CFG="mod_lbmethod_heartbeat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..\..
+# mod_proxy_http2 must be built after mod_proxy and mod_http2
+!IF EXIST("srclib\nghttp2")
+	cd modules\http2
+	 $(MAKE) $(MAKEOPT) -f mod_http2.mak         CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak   CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	cd ..\..
+!ENDIF
 	cd modules\session
 	 $(MAKE) $(MAKEOPT) -f mod_session.mak        CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -780,6 +786,7 @@ _copybin:
 	copy modules\http\$(LONG)\mod_mime.$(src_so) 		"$(inst_so)" <.y
 !IF EXIST("srclib\nghttp2")
 	copy modules\http2\$(LONG)\mod_http2.$(src_so) 		"$(inst_so)" <.y
+	copy modules\http2\$(LONG)\mod_proxy_http2.$(src_so) 		"$(inst_so)" <.y
 !IF "$(SHORT)" == "D"
 	copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll)		 	"$(inst_dll)" <.y
 !ELSE
diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index c99cbdc602..29ab094580 100644
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -168,6 +168,7 @@ BEGIN {
           print "#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so" > dstfl;
           print "#LoadModule proxy_html_module modules/mod_proxy_html.so" > dstfl;
           print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl;
+          print "#LoadModule proxy_http2_module modules/mod_proxy_http2.so" > dstfl;
           print "#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so" > dstfl;
           print "#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so" > dstfl;
           print "#LoadModule ratelimit_module modules/mod_ratelimit.so" > dstfl;
diff --git a/modules/http2/mod_proxy_http2.dep b/modules/http2/mod_proxy_http2.dep
new file mode 100644
index 0000000000..7a3a856e22
--- /dev/null
+++ b/modules/http2/mod_proxy_http2.dep
@@ -0,0 +1,208 @@
+# Microsoft Developer Studio Generated Dependency File, included by mod_proxy_http2.mak

+

+./h2_proxy_session.c : \

+	"..\..\include\ap_config.h"\

+	"..\..\include\ap_config_layout.h"\

+	"..\..\include\ap_expr.h"\

+	"..\..\include\ap_hooks.h"\

+	"..\..\include\ap_mmn.h"\

+	"..\..\include\ap_mpm.h"\

+	"..\..\include\ap_provider.h"\

+	"..\..\include\ap_regex.h"\

+	"..\..\include\ap_release.h"\

+	"..\..\include\ap_slotmem.h"\

+	"..\..\include\apache_noprobes.h"\

+	"..\..\include\http_config.h"\

+	"..\..\include\http_connection.h"\

+	"..\..\include\http_core.h"\

+	"..\..\include\http_log.h"\

+	"..\..\include\http_main.h"\

+	"..\..\include\http_protocol.h"\

+	"..\..\include\http_request.h"\

+	"..\..\include\http_vhost.h"\

+	"..\..\include\httpd.h"\

+	"..\..\include\mod_proxy.h"\

+	"..\..\include\mpm_common.h"\

+	"..\..\include\os.h"\

+	"..\..\include\scoreboard.h"\

+	"..\..\include\util_cfgtree.h"\

+	"..\..\include\util_charset.h"\

+	"..\..\include\util_ebcdic.h"\

+	"..\..\include\util_filter.h"\

+	"..\..\include\util_mutex.h"\

+	"..\..\srclib\apr-util\include\apr_buckets.h"\

+	"..\..\srclib\apr-util\include\apr_date.h"\

+	"..\..\srclib\apr-util\include\apr_hooks.h"\

+	"..\..\srclib\apr-util\include\apr_md5.h"\

+	"..\..\srclib\apr-util\include\apr_optional.h"\

+	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\

+	"..\..\srclib\apr-util\include\apr_reslist.h"\

+	"..\..\srclib\apr-util\include\apr_strmatch.h"\

+	"..\..\srclib\apr-util\include\apr_uri.h"\

+	"..\..\srclib\apr-util\include\apr_uuid.h"\

+	"..\..\srclib\apr-util\include\apr_xlate.h"\

+	"..\..\srclib\apr-util\include\apu.h"\

+	"..\..\srclib\apr\include\apr.h"\

+	"..\..\srclib\apr\include\apr_allocator.h"\

+	"..\..\srclib\apr\include\apr_dso.h"\

+	"..\..\srclib\apr\include\apr_errno.h"\

+	"..\..\srclib\apr\include\apr_file_info.h"\

+	"..\..\srclib\apr\include\apr_file_io.h"\

+	"..\..\srclib\apr\include\apr_fnmatch.h"\

+	"..\..\srclib\apr\include\apr_general.h"\

+	"..\..\srclib\apr\include\apr_global_mutex.h"\

+	"..\..\srclib\apr\include\apr_hash.h"\

+	"..\..\srclib\apr\include\apr_inherit.h"\

+	"..\..\srclib\apr\include\apr_lib.h"\

+	"..\..\srclib\apr\include\apr_mmap.h"\

+	"..\..\srclib\apr\include\apr_network_io.h"\

+	"..\..\srclib\apr\include\apr_poll.h"\

+	"..\..\srclib\apr\include\apr_pools.h"\

+	"..\..\srclib\apr\include\apr_portable.h"\

+	"..\..\srclib\apr\include\apr_proc_mutex.h"\

+	"..\..\srclib\apr\include\apr_ring.h"\

+	"..\..\srclib\apr\include\apr_shm.h"\

+	"..\..\srclib\apr\include\apr_strings.h"\

+	"..\..\srclib\apr\include\apr_tables.h"\

+	"..\..\srclib\apr\include\apr_thread_mutex.h"\

+	"..\..\srclib\apr\include\apr_thread_proc.h"\

+	"..\..\srclib\apr\include\apr_time.h"\

+	"..\..\srclib\apr\include\apr_user.h"\

+	"..\..\srclib\apr\include\apr_want.h"\

+	"..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2.h"\

+	"..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2ver.h"\

+	".\h2.h"\

+	".\h2_proxy_session.h"\

+	".\h2_util.h"\

+	".\mod_http2.h"\

+	

+

+./h2_util.c : \

+	"..\..\include\ap_config.h"\

+	"..\..\include\ap_config_layout.h"\

+	"..\..\include\ap_expr.h"\

+	"..\..\include\ap_hooks.h"\

+	"..\..\include\ap_mmn.h"\

+	"..\..\include\ap_regex.h"\

+	"..\..\include\ap_release.h"\

+	"..\..\include\apache_noprobes.h"\

+	"..\..\include\http_config.h"\

+	"..\..\include\http_core.h"\

+	"..\..\include\http_log.h"\

+	"..\..\include\http_request.h"\

+	"..\..\include\httpd.h"\

+	"..\..\include\os.h"\

+	"..\..\include\util_cfgtree.h"\

+	"..\..\include\util_filter.h"\

+	"..\..\srclib\apr-util\include\apr_buckets.h"\

+	"..\..\srclib\apr-util\include\apr_hooks.h"\

+	"..\..\srclib\apr-util\include\apr_optional.h"\

+	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\

+	"..\..\srclib\apr-util\include\apr_uri.h"\

+	"..\..\srclib\apr-util\include\apu.h"\

+	"..\..\srclib\apr\include\apr.h"\

+	"..\..\srclib\apr\include\apr_allocator.h"\

+	"..\..\srclib\apr\include\apr_errno.h"\

+	"..\..\srclib\apr\include\apr_file_info.h"\

+	"..\..\srclib\apr\include\apr_file_io.h"\

+	"..\..\srclib\apr\include\apr_general.h"\

+	"..\..\srclib\apr\include\apr_hash.h"\

+	"..\..\srclib\apr\include\apr_inherit.h"\

+	"..\..\srclib\apr\include\apr_mmap.h"\

+	"..\..\srclib\apr\include\apr_network_io.h"\

+	"..\..\srclib\apr\include\apr_poll.h"\

+	"..\..\srclib\apr\include\apr_pools.h"\

+	"..\..\srclib\apr\include\apr_ring.h"\

+	"..\..\srclib\apr\include\apr_strings.h"\

+	"..\..\srclib\apr\include\apr_tables.h"\

+	"..\..\srclib\apr\include\apr_thread_mutex.h"\

+	"..\..\srclib\apr\include\apr_thread_proc.h"\

+	"..\..\srclib\apr\include\apr_time.h"\

+	"..\..\srclib\apr\include\apr_user.h"\

+	"..\..\srclib\apr\include\apr_want.h"\

+	"..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2.h"\

+	"..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2ver.h"\

+	".\h2.h"\

+	".\h2_util.h"\

+	

+

+..\..\build\win32\httpd.rc : \

+	"..\..\include\ap_release.h"\

+	

+

+./mod_proxy_http2.c : \

+	"..\..\include\ap_config.h"\

+	"..\..\include\ap_config_layout.h"\

+	"..\..\include\ap_expr.h"\

+	"..\..\include\ap_hooks.h"\

+	"..\..\include\ap_mmn.h"\

+	"..\..\include\ap_provider.h"\

+	"..\..\include\ap_regex.h"\

+	"..\..\include\ap_release.h"\

+	"..\..\include\ap_slotmem.h"\

+	"..\..\include\apache_noprobes.h"\

+	"..\..\include\http_config.h"\

+	"..\..\include\http_connection.h"\

+	"..\..\include\http_core.h"\

+	"..\..\include\http_log.h"\

+	"..\..\include\http_main.h"\

+	"..\..\include\http_protocol.h"\

+	"..\..\include\http_request.h"\

+	"..\..\include\http_vhost.h"\

+	"..\..\include\httpd.h"\

+	"..\..\include\mod_proxy.h"\

+	"..\..\include\os.h"\

+	"..\..\include\util_cfgtree.h"\

+	"..\..\include\util_charset.h"\

+	"..\..\include\util_ebcdic.h"\

+	"..\..\include\util_filter.h"\

+	"..\..\include\util_mutex.h"\

+	"..\..\srclib\apr-util\include\apr_buckets.h"\

+	"..\..\srclib\apr-util\include\apr_date.h"\

+	"..\..\srclib\apr-util\include\apr_hooks.h"\

+	"..\..\srclib\apr-util\include\apr_md5.h"\

+	"..\..\srclib\apr-util\include\apr_optional.h"\

+	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\

+	"..\..\srclib\apr-util\include\apr_reslist.h"\

+	"..\..\srclib\apr-util\include\apr_strmatch.h"\

+	"..\..\srclib\apr-util\include\apr_uri.h"\

+	"..\..\srclib\apr-util\include\apr_uuid.h"\

+	"..\..\srclib\apr-util\include\apr_xlate.h"\

+	"..\..\srclib\apr-util\include\apu.h"\

+	"..\..\srclib\apr\include\apr.h"\

+	"..\..\srclib\apr\include\apr_allocator.h"\

+	"..\..\srclib\apr\include\apr_dso.h"\

+	"..\..\srclib\apr\include\apr_errno.h"\

+	"..\..\srclib\apr\include\apr_file_info.h"\

+	"..\..\srclib\apr\include\apr_file_io.h"\

+	"..\..\srclib\apr\include\apr_fnmatch.h"\

+	"..\..\srclib\apr\include\apr_general.h"\

+	"..\..\srclib\apr\include\apr_global_mutex.h"\

+	"..\..\srclib\apr\include\apr_hash.h"\

+	"..\..\srclib\apr\include\apr_inherit.h"\

+	"..\..\srclib\apr\include\apr_lib.h"\

+	"..\..\srclib\apr\include\apr_mmap.h"\

+	"..\..\srclib\apr\include\apr_network_io.h"\

+	"..\..\srclib\apr\include\apr_poll.h"\

+	"..\..\srclib\apr\include\apr_pools.h"\

+	"..\..\srclib\apr\include\apr_portable.h"\

+	"..\..\srclib\apr\include\apr_proc_mutex.h"\

+	"..\..\srclib\apr\include\apr_ring.h"\

+	"..\..\srclib\apr\include\apr_shm.h"\

+	"..\..\srclib\apr\include\apr_strings.h"\

+	"..\..\srclib\apr\include\apr_tables.h"\

+	"..\..\srclib\apr\include\apr_thread_mutex.h"\

+	"..\..\srclib\apr\include\apr_thread_proc.h"\

+	"..\..\srclib\apr\include\apr_time.h"\

+	"..\..\srclib\apr\include\apr_user.h"\

+	"..\..\srclib\apr\include\apr_want.h"\

+	"..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2.h"\

+	"..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2ver.h"\

+	".\h2.h"\

+	".\h2_proxy_session.h"\

+	".\h2_request.h"\

+	".\h2_util.h"\

+	".\h2_version.h"\

+	".\mod_http2.h"\

+	".\mod_proxy_http2.h"\

+	

diff --git a/modules/http2/mod_proxy_http2.mak b/modules/http2/mod_proxy_http2.mak
new file mode 100644
index 0000000000..6eefdc5f58
--- /dev/null
+++ b/modules/http2/mod_proxy_http2.mak
@@ -0,0 +1,427 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on mod_proxy_http2.dsp

+!IF "$(CFG)" == ""

+CFG=mod_proxy_http2 - Win32 Release

+!MESSAGE No configuration specified. Defaulting to mod_proxy_http2 - Win32 Release.

+!ENDIF 

+

+!IF "$(CFG)" != "mod_proxy_http2 - Win32 Release" && "$(CFG)" != "mod_proxy_http2 - Win32 Debug"

+!MESSAGE Invalid configuration "$(CFG)" specified.

+!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 "mod_proxy_http2.mak" CFG="mod_proxy_http2 - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "mod_proxy_http2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "mod_proxy_http2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+!ERROR An invalid configuration is specified.

+!ENDIF 

+

+!IF "$(OS)" == "Windows_NT"

+NULL=

+!ELSE 

+NULL=nul

+!ENDIF 

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+OUTDIR=.\Release

+INTDIR=.\Release

+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep

+# Begin Custom Macros

+OutDir=.\Release

+# End Custom Macros

+

+!IF "$(RECURSE)" == "0" 

+

+ALL : "$(OUTDIR)\mod_proxy_http2.so" "$(DS_POSTBUILD_DEP)"

+

+!ELSE 

+

+ALL : "mod_proxy - Win32 Release" "mod_http2 - Win32 Release" "libhttpd - Win32 Release" "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_proxy_http2.so" "$(DS_POSTBUILD_DEP)"

+

+!ENDIF 

+

+!IF "$(RECURSE)" == "1" 

+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" "mod_http2 - Win32 ReleaseCLEAN" "mod_proxy - Win32 ReleaseCLEAN" 

+!ELSE 

+CLEAN :

+!ENDIF 

+	-@erase "$(INTDIR)\h2_proxy_session.obj"

+	-@erase "$(INTDIR)\h2_proxy_util.obj"

+	-@erase "$(INTDIR)\mod_proxy_http2.obj"

+	-@erase "$(INTDIR)\mod_proxy_http2.res"

+	-@erase "$(INTDIR)\mod_proxy_http2_src.idb"

+	-@erase "$(INTDIR)\mod_proxy_http2_src.pdb"

+	-@erase "$(OUTDIR)\mod_proxy_http2.exp"

+	-@erase "$(OUTDIR)\mod_proxy_http2.lib"

+	-@erase "$(OUTDIR)\mod_proxy_http2.pdb"

+	-@erase "$(OUTDIR)\mod_proxy_http2.so"

+

+"$(OUTDIR)" :

+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

+

+CPP=cl.exe

+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../ssl" /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ssize_t=long /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy_http2_src" /FD /c 

+

+.c{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cpp{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cxx{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.c{$(INTDIR)}.sbr::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cpp{$(INTDIR)}.sbr::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cxx{$(INTDIR)}.sbr::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+MTL=midl.exe

+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

+RSC=rc.exe

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_proxy_http2.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_http2.so" /d LONG_NAME="http2_module for Apache" 

+BSC32=bscmake.exe

+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy_http2.bsc" 

+BSC32_SBRS= \

+	

+LINK32=link.exe

+LINK32_FLAGS=kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy_http2.pdb" /debug /out:"$(OUTDIR)\mod_proxy_http2.so" /implib:"$(OUTDIR)\mod_proxy_http2.lib" /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_http2.so /opt:ref 

+LINK32_OBJS= \

+	"$(INTDIR)\h2_proxy_session.obj" \

+	"$(INTDIR)\h2_proxy_util.obj" \

+	"$(INTDIR)\mod_proxy_http2.obj" \

+	"$(INTDIR)\mod_proxy_http2.res" \

+	"..\..\srclib\apr\Release\libapr-1.lib" \

+	"..\..\srclib\apr-util\Release\libaprutil-1.lib" \

+	"..\..\Release\libhttpd.lib" \

+	"$(OUTDIR)\mod_http2.lib" \

+	"..\proxy\Release\mod_proxy.lib"

+

+"$(OUTDIR)\mod_proxy_http2.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

+TargetPath=.\Release\mod_proxy_http2.so

+SOURCE="$(InputPath)"

+PostBuild_Desc=Embed .manifest

+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep

+

+# Begin Custom Macros

+OutDir=.\Release

+# End Custom Macros

+

+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_proxy_http2.so"

+   if exist .\Release\mod_proxy_http2.so.manifest mt.exe -manifest .\Release\mod_proxy_http2.so.manifest -outputresource:.\Release\mod_proxy_http2.so;2

+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+OUTDIR=.\Debug

+INTDIR=.\Debug

+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep

+# Begin Custom Macros

+OutDir=.\Debug

+# End Custom Macros

+

+!IF "$(RECURSE)" == "0" 

+

+ALL : "$(OUTDIR)\mod_proxy_http2.so" "$(DS_POSTBUILD_DEP)"

+

+!ELSE 

+

+ALL : "mod_proxy - Win32 Debug" "mod_http2 - Win32 Debug" "libhttpd - Win32 Debug" "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_proxy_http2.so" "$(DS_POSTBUILD_DEP)"

+

+!ENDIF 

+

+!IF "$(RECURSE)" == "1" 

+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" "mod_http2 - Win32 DebugCLEAN" "mod_proxy - Win32 DebugCLEAN" 

+!ELSE 

+CLEAN :

+!ENDIF 

+	-@erase "$(INTDIR)\h2_proxy_session.obj"

+	-@erase "$(INTDIR)\h2_proxy_util.obj"

+	-@erase "$(INTDIR)\mod_proxy_http2.obj"

+	-@erase "$(INTDIR)\mod_proxy_http2.res"

+	-@erase "$(INTDIR)\mod_proxy_http2_src.idb"

+	-@erase "$(INTDIR)\mod_proxy_http2_src.pdb"

+	-@erase "$(OUTDIR)\mod_proxy_http2.exp"

+	-@erase "$(OUTDIR)\mod_proxy_http2.lib"

+	-@erase "$(OUTDIR)\mod_proxy_http2.pdb"

+	-@erase "$(OUTDIR)\mod_proxy_http2.so"

+

+"$(OUTDIR)" :

+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

+

+CPP=cl.exe

+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../ssl" /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ssize_t=long /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy_http2_src" /FD /EHsc /c 

+

+.c{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cpp{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cxx{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.c{$(INTDIR)}.sbr::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cpp{$(INTDIR)}.sbr::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+.cxx{$(INTDIR)}.sbr::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+MTL=midl.exe

+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

+RSC=rc.exe

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_proxy_http2.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_http2.so" /d LONG_NAME="http2_module for Apache" 

+BSC32=bscmake.exe

+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy_http2.bsc" 

+BSC32_SBRS= \

+	

+LINK32=link.exe

+LINK32_FLAGS=kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy_http2.pdb" /debug /out:"$(OUTDIR)\mod_proxy_http2.so" /implib:"$(OUTDIR)\mod_proxy_http2.lib" /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_http2.so 

+LINK32_OBJS= \

+	"$(INTDIR)\h2_proxy_session.obj" \

+	"$(INTDIR)\h2_proxy_util.obj" \

+	"$(INTDIR)\mod_proxy_http2.obj" \

+	"$(INTDIR)\mod_proxy_http2.res" \

+	"..\..\srclib\apr\Debug\libapr-1.lib" \

+	"..\..\srclib\apr-util\Debug\libaprutil-1.lib" \

+	"..\..\Debug\libhttpd.lib" \

+	"$(OUTDIR)\mod_http2.lib" \

+	"..\proxy\Debug\mod_proxy.lib"

+

+"$(OUTDIR)\mod_proxy_http2.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

+TargetPath=.\Debug\mod_proxy_http2.so

+SOURCE="$(InputPath)"

+PostBuild_Desc=Embed .manifest

+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep

+

+# Begin Custom Macros

+OutDir=.\Debug

+# End Custom Macros

+

+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_proxy_http2.so"

+   if exist .\Debug\mod_proxy_http2.so.manifest mt.exe -manifest .\Debug\mod_proxy_http2.so.manifest -outputresource:.\Debug\mod_proxy_http2.so;2

+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"

+

+!ENDIF 

+

+

+!IF "$(NO_EXTERNAL_DEPS)" != "1"

+!IF EXISTS("mod_proxy_http2.dep")

+!INCLUDE "mod_proxy_http2.dep"

+!ELSE 

+!MESSAGE Warning: cannot find "mod_proxy_http2.dep"

+!ENDIF 

+!ENDIF 

+

+

+!IF "$(CFG)" == "mod_proxy_http2 - Win32 Release" || "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+"libapr - Win32 Release" : 

+   cd ".\..\..\srclib\apr"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 

+   cd "..\..\modules\http2"

+

+"libapr - Win32 ReleaseCLEAN" : 

+   cd ".\..\..\srclib\apr"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 

+   cd "..\..\modules\http2"

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+"libapr - Win32 Debug" : 

+   cd ".\..\..\srclib\apr"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 

+   cd "..\..\modules\http2"

+

+"libapr - Win32 DebugCLEAN" : 

+   cd ".\..\..\srclib\apr"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 

+   cd "..\..\modules\http2"

+

+!ENDIF 

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+"libaprutil - Win32 Release" : 

+   cd ".\..\..\srclib\apr-util"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 

+   cd "..\..\modules\http2"

+

+"libaprutil - Win32 ReleaseCLEAN" : 

+   cd ".\..\..\srclib\apr-util"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 

+   cd "..\..\modules\http2"

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+"libaprutil - Win32 Debug" : 

+   cd ".\..\..\srclib\apr-util"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 

+   cd "..\..\modules\http2"

+

+"libaprutil - Win32 DebugCLEAN" : 

+   cd ".\..\..\srclib\apr-util"

+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 

+   cd "..\..\modules\http2"

+

+!ENDIF 

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+"libhttpd - Win32 Release" : 

+   cd ".\..\.."

+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 

+   cd ".\modules\http2"

+

+"libhttpd - Win32 ReleaseCLEAN" : 

+   cd ".\..\.."

+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" RECURSE=1 CLEAN 

+   cd ".\modules\http2"

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+"libhttpd - Win32 Debug" : 

+   cd ".\..\.."

+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 

+   cd ".\modules\http2"

+

+"libhttpd - Win32 DebugCLEAN" : 

+   cd ".\..\.."

+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" RECURSE=1 CLEAN 

+   cd ".\modules\http2"

+

+!ENDIF 

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+"mod_http2 - Win32 Release" : 

+   cd "."

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Release" 

+   cd "."

+

+"mod_http2 - Win32 ReleaseCLEAN" : 

+   cd "."

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Release" RECURSE=1 CLEAN 

+   cd "."

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+"mod_http2 - Win32 Debug" : 

+   cd "."

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Debug" 

+   cd "."

+

+"mod_http2 - Win32 DebugCLEAN" : 

+   cd "."

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Debug" RECURSE=1 CLEAN 

+   cd "."

+

+!ENDIF 

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+"mod_proxy - Win32 Release" : 

+   cd ".\..\proxy"

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Release" 

+   cd "..\http2"

+

+"mod_proxy - Win32 ReleaseCLEAN" : 

+   cd ".\..\proxy"

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Release" RECURSE=1 CLEAN 

+   cd "..\http2"

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+"mod_proxy - Win32 Debug" : 

+   cd ".\..\proxy"

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Debug" 

+   cd "..\http2"

+

+"mod_proxy - Win32 DebugCLEAN" : 

+   cd ".\..\proxy"

+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Debug" RECURSE=1 CLEAN 

+   cd "..\http2"

+

+!ENDIF 

+

+SOURCE=./h2_proxy_session.c

+

+"$(INTDIR)\h2_proxy_session.obj" : $(SOURCE) "$(INTDIR)"

+

+

+SOURCE=./h2_proxy_util.c

+

+"$(INTDIR)\h2_proxy_util.obj" : $(SOURCE) "$(INTDIR)"

+

+

+SOURCE=..\..\build\win32\httpd.rc

+

+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"

+

+

+"$(INTDIR)\mod_proxy_http2.res" : $(SOURCE) "$(INTDIR)"

+	$(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_http2.res" /i "../../include" /i "../../srclib/apr/include" /i "\Build11\httpd-2.4.21-dev-mph2\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_http2.so" /d LONG_NAME="http2_module for Apache" $(SOURCE)

+

+

+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"

+

+

+"$(INTDIR)\mod_proxy_http2.res" : $(SOURCE) "$(INTDIR)"

+	$(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_http2.res" /i "../../include" /i "../../srclib/apr/include" /i "\Build11\httpd-2.4.21-dev-mph2\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_http2.so" /d LONG_NAME="http2_module for Apache" $(SOURCE)

+

+

+!ENDIF 

+

+SOURCE=./mod_proxy_http2.c

+

+"$(INTDIR)\mod_proxy_http2.obj" : $(SOURCE) "$(INTDIR)"

+

+

+

+!ENDIF 

+

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 2cc6185271..5ca4dce645 100644
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -127,3 +127,4 @@ mod_optional_hook_export.so 0x70BD0000    0x00010000
 mod_optional_hook_import.so 0x70BE0000    0x00010000
 mod_authnz_fcgi.so          0x70BF0000    0x00020000
 mod_http2.so                0x70C10000    0x00030000
+mod_proxy_http2.so          0x70C40000    0x00020000