Commit 42e0d0cf authored by Gregg Lewis Smith's avatar Gregg Lewis Smith
Browse files

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
parent 8ef718b3

Apache-apr2.dsw

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

Apache.dsw

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

Makefile.win

+13 −6
Original line number Diff line number Diff line
@@ -221,12 +221,16 @@ _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_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

build/installwinconf.awk

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

modules/http2/mod_proxy_http2.dep

0 → 100644
+208 −0
Original line number Diff line number Diff line 
# 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"\