svn commit: r1730075 - in /httpd/httpd/trunk: CMakeLists.txt build/installwinconf.awk build/mkconfNW.awk

[rj...@apache.org]

Author: rjung
Date: Fri Feb 12 17:20:22 2016
New Revision: 1730075

URL: http://svn.apache.org/viewvc?rev=1730075&view=rev
Log:
More mod_proxy_http2 build support:
- include in Windows and Netware LoadModule lists
- add to cmake build file
Untested.

Modified:
    httpd/httpd/trunk/CMakeLists.txt
    httpd/httpd/trunk/build/installwinconf.awk
    httpd/httpd/trunk/build/mkconfNW.awk

Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1730075&r1=1730074&r2=1730075&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Fri Feb 12 17:20:22 2016
@@ -334,6 +334,7 @@ SET(MODULE_LIST
   "modules/proxy/mod_proxy_http+I+Apache proxy HTTP module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_scgi+I+Apache proxy SCGI module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_wstunnel+I+Apache proxy Websocket Tunnel module.  Requires and is enabled by --enable-proxy."
+  "modules/http2/mod_proxy_http2+i+Apache proxy HTTP/2 module.  Requires --enable-proxy."
   "modules/proxy/mod_serf+O+Reverse proxy module using Serf"
   "modules/session/mod_session+I+session module"
   "modules/session/mod_session_cookie+I+session cookie module"
@@ -450,6 +451,14 @@ IF(LIBXML2_FOUND)
 ENDIF()
 SET(mod_proxy_scgi_extra_libs        mod_proxy)
 SET(mod_proxy_wstunnel_extra_libs    mod_proxy)
+SET(mod_proxy_http2_requires               NGHTTP2_FOUND)
+SET(mod_proxy_http2_extra_defines          ssize_t=long)
+SET(mod_proxy_http2_extra_libs             ${NGHTTP2_LIBRARIES})
+SET(mod_proxy_http2_extra_sources
+  modules/http2/h2_proxy_session.c   modules/http2/h2_request.c
+  modules/http2/h2_util.c
+)
+SET(mod_proxy_http2_extra_libs       mod_proxy)
 SET(mod_ratelimit_extra_defines      AP_RL_DECLARE_EXPORT)
 SET(mod_sed_extra_sources
   modules/filters/regexp.c           modules/filters/sed0.c

Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=1730075&r1=1730074&r2=1730075&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Fri Feb 12 17:20:22 2016
@@ -173,6 +173,7 @@ BEGIN {
           print "#LoadModule proxy_http_module modules/mod_proxy_http.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 proxy_http2_module modules/mod_proxy_http2.so" > dstfl;
           print "#LoadModule ratelimit_module modules/mod_ratelimit.so" > dstfl;
           print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl;
           print "#LoadModule remoteip_module modules/mod_remoteip.so" > dstfl;

Modified: httpd/httpd/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/mkconfNW.awk?rev=1730075&r1=1730074&r2=1730075&view=diff
==============================================================================
--- httpd/httpd/trunk/build/mkconfNW.awk (original)
+++ httpd/httpd/trunk/build/mkconfNW.awk Fri Feb 12 17:20:22 2016
@@ -97,6 +97,10 @@ BEGIN {
        print "#LoadModule socache_shmcb_module modules/socacheshmcb.nlm"
        print "#LoadModule ssl_module modules/mod_ssl.nlm"
     }
+    if (MODHTTP2) {
+       print "#LoadModule http2_module modules/mod_http2.nlm"
+       print "#LoadModule proxy_http2_module modules/proxyhttp2.nlm"
+    }
     print ""
     next
 }