From: Rainer Jung <rjung@apache.org>
Date: Fri, 12 Feb 2016 17:20:22 +0000 (+0000)
Subject: More mod_proxy_http2 build support:
X-Git-Tag: 2.5.0-alpha~2090
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3244dd32544cf68068f80ef09d647a13be388bac;p=thirdparty%2Fapache%2Fhttpd.git

More mod_proxy_http2 build support:
- include in Windows and Netware LoadModule lists
- add to cmake build file
Untested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730075 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6aa2604044..3ea412f02d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index b195fea6530..b8693aac7fd 100644
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -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;
diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 40ef183c106..465cccf602d 100644
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -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
 }