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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 3fbc62d2b8bb95dbee8e4e712cdc86fe5fcf0278..2b659793001227bcb1ffdaca545c6571533a2c3c 100644 (file)
--- 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 a77b870a611f081648288b461b7371542f50513f..20259d25b633f6eb25426870631c8b0716dbf21c 100644 (file)
--- 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 f6a82e5b5e7850d6eaf243b487bcc44fd1ab5cc5..d3cb5c52f758cf54090ed20403272ae83b121c6f 100644 (file)
--- 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 c99cbdc602a3eb98a5d7c546eb60c032bb5ccb43..29ab0945802e4cccc855405ea2a54b9373db78cd 100644 (file)
--- 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 (file)
index 0000000..7a3a856
--- /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\r
+\r
+./h2_proxy_session.c : \\r
+       "..\..\include\ap_config.h"\\r
+       "..\..\include\ap_config_layout.h"\\r
+       "..\..\include\ap_expr.h"\\r
+       "..\..\include\ap_hooks.h"\\r
+       "..\..\include\ap_mmn.h"\\r
+       "..\..\include\ap_mpm.h"\\r
+       "..\..\include\ap_provider.h"\\r
+       "..\..\include\ap_regex.h"\\r
+       "..\..\include\ap_release.h"\\r
+       "..\..\include\ap_slotmem.h"\\r
+       "..\..\include\apache_noprobes.h"\\r
+       "..\..\include\http_config.h"\\r
+       "..\..\include\http_connection.h"\\r
+       "..\..\include\http_core.h"\\r
+       "..\..\include\http_log.h"\\r
+       "..\..\include\http_main.h"\\r
+       "..\..\include\http_protocol.h"\\r
+       "..\..\include\http_request.h"\\r
+       "..\..\include\http_vhost.h"\\r
+       "..\..\include\httpd.h"\\r
+       "..\..\include\mod_proxy.h"\\r
+       "..\..\include\mpm_common.h"\\r
+       "..\..\include\os.h"\\r
+       "..\..\include\scoreboard.h"\\r
+       "..\..\include\util_cfgtree.h"\\r
+       "..\..\include\util_charset.h"\\r
+       "..\..\include\util_ebcdic.h"\\r
+       "..\..\include\util_filter.h"\\r
+       "..\..\include\util_mutex.h"\\r
+       "..\..\srclib\apr-util\include\apr_buckets.h"\\r
+       "..\..\srclib\apr-util\include\apr_date.h"\\r
+       "..\..\srclib\apr-util\include\apr_hooks.h"\\r
+       "..\..\srclib\apr-util\include\apr_md5.h"\\r
+       "..\..\srclib\apr-util\include\apr_optional.h"\\r
+       "..\..\srclib\apr-util\include\apr_optional_hooks.h"\\r
+       "..\..\srclib\apr-util\include\apr_reslist.h"\\r
+       "..\..\srclib\apr-util\include\apr_strmatch.h"\\r
+       "..\..\srclib\apr-util\include\apr_uri.h"\\r
+       "..\..\srclib\apr-util\include\apr_uuid.h"\\r
+       "..\..\srclib\apr-util\include\apr_xlate.h"\\r
+       "..\..\srclib\apr-util\include\apu.h"\\r
+       "..\..\srclib\apr\include\apr.h"\\r
+       "..\..\srclib\apr\include\apr_allocator.h"\\r
+       "..\..\srclib\apr\include\apr_dso.h"\\r
+       "..\..\srclib\apr\include\apr_errno.h"\\r
+       "..\..\srclib\apr\include\apr_file_info.h"\\r
+       "..\..\srclib\apr\include\apr_file_io.h"\\r
+       "..\..\srclib\apr\include\apr_fnmatch.h"\\r
+       "..\..\srclib\apr\include\apr_general.h"\\r
+       "..\..\srclib\apr\include\apr_global_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_hash.h"\\r
+       "..\..\srclib\apr\include\apr_inherit.h"\\r
+       "..\..\srclib\apr\include\apr_lib.h"\\r
+       "..\..\srclib\apr\include\apr_mmap.h"\\r
+       "..\..\srclib\apr\include\apr_network_io.h"\\r
+       "..\..\srclib\apr\include\apr_poll.h"\\r
+       "..\..\srclib\apr\include\apr_pools.h"\\r
+       "..\..\srclib\apr\include\apr_portable.h"\\r
+       "..\..\srclib\apr\include\apr_proc_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_ring.h"\\r
+       "..\..\srclib\apr\include\apr_shm.h"\\r
+       "..\..\srclib\apr\include\apr_strings.h"\\r
+       "..\..\srclib\apr\include\apr_tables.h"\\r
+       "..\..\srclib\apr\include\apr_thread_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_thread_proc.h"\\r
+       "..\..\srclib\apr\include\apr_time.h"\\r
+       "..\..\srclib\apr\include\apr_user.h"\\r
+       "..\..\srclib\apr\include\apr_want.h"\\r
+       "..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2.h"\\r
+       "..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2ver.h"\\r
+       ".\h2.h"\\r
+       ".\h2_proxy_session.h"\\r
+       ".\h2_util.h"\\r
+       ".\mod_http2.h"\\r
+       \r
+\r
+./h2_util.c : \\r
+       "..\..\include\ap_config.h"\\r
+       "..\..\include\ap_config_layout.h"\\r
+       "..\..\include\ap_expr.h"\\r
+       "..\..\include\ap_hooks.h"\\r
+       "..\..\include\ap_mmn.h"\\r
+       "..\..\include\ap_regex.h"\\r
+       "..\..\include\ap_release.h"\\r
+       "..\..\include\apache_noprobes.h"\\r
+       "..\..\include\http_config.h"\\r
+       "..\..\include\http_core.h"\\r
+       "..\..\include\http_log.h"\\r
+       "..\..\include\http_request.h"\\r
+       "..\..\include\httpd.h"\\r
+       "..\..\include\os.h"\\r
+       "..\..\include\util_cfgtree.h"\\r
+       "..\..\include\util_filter.h"\\r
+       "..\..\srclib\apr-util\include\apr_buckets.h"\\r
+       "..\..\srclib\apr-util\include\apr_hooks.h"\\r
+       "..\..\srclib\apr-util\include\apr_optional.h"\\r
+       "..\..\srclib\apr-util\include\apr_optional_hooks.h"\\r
+       "..\..\srclib\apr-util\include\apr_uri.h"\\r
+       "..\..\srclib\apr-util\include\apu.h"\\r
+       "..\..\srclib\apr\include\apr.h"\\r
+       "..\..\srclib\apr\include\apr_allocator.h"\\r
+       "..\..\srclib\apr\include\apr_errno.h"\\r
+       "..\..\srclib\apr\include\apr_file_info.h"\\r
+       "..\..\srclib\apr\include\apr_file_io.h"\\r
+       "..\..\srclib\apr\include\apr_general.h"\\r
+       "..\..\srclib\apr\include\apr_hash.h"\\r
+       "..\..\srclib\apr\include\apr_inherit.h"\\r
+       "..\..\srclib\apr\include\apr_mmap.h"\\r
+       "..\..\srclib\apr\include\apr_network_io.h"\\r
+       "..\..\srclib\apr\include\apr_poll.h"\\r
+       "..\..\srclib\apr\include\apr_pools.h"\\r
+       "..\..\srclib\apr\include\apr_ring.h"\\r
+       "..\..\srclib\apr\include\apr_strings.h"\\r
+       "..\..\srclib\apr\include\apr_tables.h"\\r
+       "..\..\srclib\apr\include\apr_thread_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_thread_proc.h"\\r
+       "..\..\srclib\apr\include\apr_time.h"\\r
+       "..\..\srclib\apr\include\apr_user.h"\\r
+       "..\..\srclib\apr\include\apr_want.h"\\r
+       "..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2.h"\\r
+       "..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2ver.h"\\r
+       ".\h2.h"\\r
+       ".\h2_util.h"\\r
+       \r
+\r
+..\..\build\win32\httpd.rc : \\r
+       "..\..\include\ap_release.h"\\r
+       \r
+\r
+./mod_proxy_http2.c : \\r
+       "..\..\include\ap_config.h"\\r
+       "..\..\include\ap_config_layout.h"\\r
+       "..\..\include\ap_expr.h"\\r
+       "..\..\include\ap_hooks.h"\\r
+       "..\..\include\ap_mmn.h"\\r
+       "..\..\include\ap_provider.h"\\r
+       "..\..\include\ap_regex.h"\\r
+       "..\..\include\ap_release.h"\\r
+       "..\..\include\ap_slotmem.h"\\r
+       "..\..\include\apache_noprobes.h"\\r
+       "..\..\include\http_config.h"\\r
+       "..\..\include\http_connection.h"\\r
+       "..\..\include\http_core.h"\\r
+       "..\..\include\http_log.h"\\r
+       "..\..\include\http_main.h"\\r
+       "..\..\include\http_protocol.h"\\r
+       "..\..\include\http_request.h"\\r
+       "..\..\include\http_vhost.h"\\r
+       "..\..\include\httpd.h"\\r
+       "..\..\include\mod_proxy.h"\\r
+       "..\..\include\os.h"\\r
+       "..\..\include\util_cfgtree.h"\\r
+       "..\..\include\util_charset.h"\\r
+       "..\..\include\util_ebcdic.h"\\r
+       "..\..\include\util_filter.h"\\r
+       "..\..\include\util_mutex.h"\\r
+       "..\..\srclib\apr-util\include\apr_buckets.h"\\r
+       "..\..\srclib\apr-util\include\apr_date.h"\\r
+       "..\..\srclib\apr-util\include\apr_hooks.h"\\r
+       "..\..\srclib\apr-util\include\apr_md5.h"\\r
+       "..\..\srclib\apr-util\include\apr_optional.h"\\r
+       "..\..\srclib\apr-util\include\apr_optional_hooks.h"\\r
+       "..\..\srclib\apr-util\include\apr_reslist.h"\\r
+       "..\..\srclib\apr-util\include\apr_strmatch.h"\\r
+       "..\..\srclib\apr-util\include\apr_uri.h"\\r
+       "..\..\srclib\apr-util\include\apr_uuid.h"\\r
+       "..\..\srclib\apr-util\include\apr_xlate.h"\\r
+       "..\..\srclib\apr-util\include\apu.h"\\r
+       "..\..\srclib\apr\include\apr.h"\\r
+       "..\..\srclib\apr\include\apr_allocator.h"\\r
+       "..\..\srclib\apr\include\apr_dso.h"\\r
+       "..\..\srclib\apr\include\apr_errno.h"\\r
+       "..\..\srclib\apr\include\apr_file_info.h"\\r
+       "..\..\srclib\apr\include\apr_file_io.h"\\r
+       "..\..\srclib\apr\include\apr_fnmatch.h"\\r
+       "..\..\srclib\apr\include\apr_general.h"\\r
+       "..\..\srclib\apr\include\apr_global_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_hash.h"\\r
+       "..\..\srclib\apr\include\apr_inherit.h"\\r
+       "..\..\srclib\apr\include\apr_lib.h"\\r
+       "..\..\srclib\apr\include\apr_mmap.h"\\r
+       "..\..\srclib\apr\include\apr_network_io.h"\\r
+       "..\..\srclib\apr\include\apr_poll.h"\\r
+       "..\..\srclib\apr\include\apr_pools.h"\\r
+       "..\..\srclib\apr\include\apr_portable.h"\\r
+       "..\..\srclib\apr\include\apr_proc_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_ring.h"\\r
+       "..\..\srclib\apr\include\apr_shm.h"\\r
+       "..\..\srclib\apr\include\apr_strings.h"\\r
+       "..\..\srclib\apr\include\apr_tables.h"\\r
+       "..\..\srclib\apr\include\apr_thread_mutex.h"\\r
+       "..\..\srclib\apr\include\apr_thread_proc.h"\\r
+       "..\..\srclib\apr\include\apr_time.h"\\r
+       "..\..\srclib\apr\include\apr_user.h"\\r
+       "..\..\srclib\apr\include\apr_want.h"\\r
+       "..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2.h"\\r
+       "..\..\srclib\nghttp2\lib\includes\nghttp2\nghttp2ver.h"\\r
+       ".\h2.h"\\r
+       ".\h2_proxy_session.h"\\r
+       ".\h2_request.h"\\r
+       ".\h2_util.h"\\r
+       ".\h2_version.h"\\r
+       ".\mod_http2.h"\\r
+       ".\mod_proxy_http2.h"\\r
+       \r

diff --git a/modules/http2/mod_proxy_http2.mak b/modules/http2/mod_proxy_http2.mak
new file mode 100644 (file)
index 0000000..6eefdc5
--- /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\r
+!IF "$(CFG)" == ""\r
+CFG=mod_proxy_http2 - Win32 Release\r
+!MESSAGE No configuration specified. Defaulting to mod_proxy_http2 - Win32 Release.\r
+!ENDIF \r
+\r
+!IF "$(CFG)" != "mod_proxy_http2 - Win32 Release" && "$(CFG)" != "mod_proxy_http2 - 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_proxy_http2.mak" CFG="mod_proxy_http2 - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "mod_proxy_http2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "mod_proxy_http2 - 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  "$(CFG)" == "mod_proxy_http2 - Win32 Release"\r
+\r
+OUTDIR=.\Release\r
+INTDIR=.\Release\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+!IF "$(RECURSE)" == "0" \r
+\r
+ALL : "$(OUTDIR)\mod_proxy_http2.so" "$(DS_POSTBUILD_DEP)"\r
+\r
+!ELSE \r
+\r
+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)"\r
+\r
+!ENDIF \r
+\r
+!IF "$(RECURSE)" == "1" \r
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" "mod_http2 - Win32 ReleaseCLEAN" "mod_proxy - Win32 ReleaseCLEAN" \r
+!ELSE \r
+CLEAN :\r
+!ENDIF \r
+       -@erase "$(INTDIR)\h2_proxy_session.obj"\r
+       -@erase "$(INTDIR)\h2_proxy_util.obj"\r
+       -@erase "$(INTDIR)\mod_proxy_http2.obj"\r
+       -@erase "$(INTDIR)\mod_proxy_http2.res"\r
+       -@erase "$(INTDIR)\mod_proxy_http2_src.idb"\r
+       -@erase "$(INTDIR)\mod_proxy_http2_src.pdb"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.exp"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.lib"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.pdb"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.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 "../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 \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_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" \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy_http2.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+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 \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\h2_proxy_session.obj" \\r
+       "$(INTDIR)\h2_proxy_util.obj" \\r
+       "$(INTDIR)\mod_proxy_http2.obj" \\r
+       "$(INTDIR)\mod_proxy_http2.res" \\r
+       "..\..\srclib\apr\Release\libapr-1.lib" \\r
+       "..\..\srclib\apr-util\Release\libaprutil-1.lib" \\r
+       "..\..\Release\libhttpd.lib" \\r
+       "$(OUTDIR)\mod_http2.lib" \\r
+       "..\proxy\Release\mod_proxy.lib"\r
+\r
+"$(OUTDIR)\mod_proxy_http2.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+TargetPath=.\Release\mod_proxy_http2.so\r
+SOURCE="$(InputPath)"\r
+PostBuild_Desc=Embed .manifest\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_proxy_http2.so"\r
+   if exist .\Release\mod_proxy_http2.so.manifest mt.exe -manifest .\Release\mod_proxy_http2.so.manifest -outputresource:.\Release\mod_proxy_http2.so;2\r
+       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+OUTDIR=.\Debug\r
+INTDIR=.\Debug\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+!IF "$(RECURSE)" == "0" \r
+\r
+ALL : "$(OUTDIR)\mod_proxy_http2.so" "$(DS_POSTBUILD_DEP)"\r
+\r
+!ELSE \r
+\r
+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)"\r
+\r
+!ENDIF \r
+\r
+!IF "$(RECURSE)" == "1" \r
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" "mod_http2 - Win32 DebugCLEAN" "mod_proxy - Win32 DebugCLEAN" \r
+!ELSE \r
+CLEAN :\r
+!ENDIF \r
+       -@erase "$(INTDIR)\h2_proxy_session.obj"\r
+       -@erase "$(INTDIR)\h2_proxy_util.obj"\r
+       -@erase "$(INTDIR)\mod_proxy_http2.obj"\r
+       -@erase "$(INTDIR)\mod_proxy_http2.res"\r
+       -@erase "$(INTDIR)\mod_proxy_http2_src.idb"\r
+       -@erase "$(INTDIR)\mod_proxy_http2_src.pdb"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.exp"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.lib"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.pdb"\r
+       -@erase "$(OUTDIR)\mod_proxy_http2.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 "../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 \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_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" \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy_http2.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+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 \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\h2_proxy_session.obj" \\r
+       "$(INTDIR)\h2_proxy_util.obj" \\r
+       "$(INTDIR)\mod_proxy_http2.obj" \\r
+       "$(INTDIR)\mod_proxy_http2.res" \\r
+       "..\..\srclib\apr\Debug\libapr-1.lib" \\r
+       "..\..\srclib\apr-util\Debug\libaprutil-1.lib" \\r
+       "..\..\Debug\libhttpd.lib" \\r
+       "$(OUTDIR)\mod_http2.lib" \\r
+       "..\proxy\Debug\mod_proxy.lib"\r
+\r
+"$(OUTDIR)\mod_proxy_http2.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+TargetPath=.\Debug\mod_proxy_http2.so\r
+SOURCE="$(InputPath)"\r
+PostBuild_Desc=Embed .manifest\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_proxy_http2.so"\r
+   if exist .\Debug\mod_proxy_http2.so.manifest mt.exe -manifest .\Debug\mod_proxy_http2.so.manifest -outputresource:.\Debug\mod_proxy_http2.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_proxy_http2.dep")\r
+!INCLUDE "mod_proxy_http2.dep"\r
+!ELSE \r
+!MESSAGE Warning: cannot find "mod_proxy_http2.dep"\r
+!ENDIF \r
+!ENDIF \r
+\r
+\r
+!IF "$(CFG)" == "mod_proxy_http2 - Win32 Release" || "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"\r
+\r
+"libapr - Win32 Release" : \r
+   cd ".\..\..\srclib\apr"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" \r
+   cd "..\..\modules\http2"\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\http2"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+"libapr - Win32 Debug" : \r
+   cd ".\..\..\srclib\apr"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" \r
+   cd "..\..\modules\http2"\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\http2"\r
+\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_proxy_http2 - 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\http2"\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\http2"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - 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\http2"\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\http2"\r
+\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"\r
+\r
+"libhttpd - Win32 Release" : \r
+   cd ".\..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" \r
+   cd ".\modules\http2"\r
+\r
+"libhttpd - Win32 ReleaseCLEAN" : \r
+   cd ".\..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" RECURSE=1 CLEAN \r
+   cd ".\modules\http2"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+"libhttpd - Win32 Debug" : \r
+   cd ".\..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" \r
+   cd ".\modules\http2"\r
+\r
+"libhttpd - Win32 DebugCLEAN" : \r
+   cd ".\..\.."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" RECURSE=1 CLEAN \r
+   cd ".\modules\http2"\r
+\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"\r
+\r
+"mod_http2 - Win32 Release" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Release" \r
+   cd "."\r
+\r
+"mod_http2 - Win32 ReleaseCLEAN" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Release" RECURSE=1 CLEAN \r
+   cd "."\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+"mod_http2 - Win32 Debug" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Debug" \r
+   cd "."\r
+\r
+"mod_http2 - Win32 DebugCLEAN" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_http2.mak" CFG="mod_http2 - Win32 Debug" RECURSE=1 CLEAN \r
+   cd "."\r
+\r
+!ENDIF \r
+\r
+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"\r
+\r
+"mod_proxy - Win32 Release" : \r
+   cd ".\..\proxy"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Release" \r
+   cd "..\http2"\r
+\r
+"mod_proxy - Win32 ReleaseCLEAN" : \r
+   cd ".\..\proxy"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Release" RECURSE=1 CLEAN \r
+   cd "..\http2"\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+"mod_proxy - Win32 Debug" : \r
+   cd ".\..\proxy"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Debug" \r
+   cd "..\http2"\r
+\r
+"mod_proxy - Win32 DebugCLEAN" : \r
+   cd ".\..\proxy"\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\mod_proxy.mak" CFG="mod_proxy - Win32 Debug" RECURSE=1 CLEAN \r
+   cd "..\http2"\r
+\r
+!ENDIF \r
+\r
+SOURCE=./h2_proxy_session.c\r
+\r
+"$(INTDIR)\h2_proxy_session.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=./h2_proxy_util.c\r
+\r
+"$(INTDIR)\h2_proxy_util.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+SOURCE=..\..\build\win32\httpd.rc\r
+\r
+!IF  "$(CFG)" == "mod_proxy_http2 - Win32 Release"\r
+\r
+\r
+"$(INTDIR)\mod_proxy_http2.res" : $(SOURCE) "$(INTDIR)"\r
+       $(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)\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_http2 - Win32 Debug"\r
+\r
+\r
+"$(INTDIR)\mod_proxy_http2.res" : $(SOURCE) "$(INTDIR)"\r
+       $(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)\r
+\r
+\r
+!ENDIF \r
+\r
+SOURCE=./mod_proxy_http2.c\r
+\r
+"$(INTDIR)\mod_proxy_http2.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
+\r
+!ENDIF \r
+\r

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 2cc6185271af5aa68a6b735147d25a81be968a8f..5ca4dce6453223efa7937f7c8e4ad5087a917d01 100644 (file)
--- 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