Merge r1712382,1713937 from trunk for cmake build

follow-up r1715371

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13636f252eb674b3a27b52b097cfacd6eabf85e..7de4c5a158e260089dc93fab32f95eaf7e7276cb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -379,17 +379,18 @@ SET(mod_http2_requires               NGHTTP2_FOUND)
 SET(mod_http2_extra_defines          ssize_t=long)
 SET(mod_http2_extra_libs             ${NGHTTP2_LIBRARIES})
 SET(mod_http2_extra_sources
-  modules/http2/h2_alt_svc.c         modules/http2/h2_config.c
+  modules/http2/h2_alt_svc.c         modules/http2/h2_bucket_eoc.c
+  modules/http2/h2_bucket_eos.c      modules/http2/h2_config.c
   modules/http2/h2_conn.c            modules/http2/h2_conn_io.c
   modules/http2/h2_ctx.c             modules/http2/h2_from_h1.c
   modules/http2/h2_h2.c              modules/http2/h2_io.c
   modules/http2/h2_io_set.c          modules/http2/h2_mplx.c
-  modules/http2/h2_request.c         modules/http2/h2_response.c
-  modules/http2/h2_session.c         modules/http2/h2_stream.c
-  modules/http2/h2_stream_set.c      modules/http2/h2_switch.c
-  modules/http2/h2_task.c            modules/http2/h2_task_input.c
-  modules/http2/h2_task_output.c     modules/http2/h2_task_queue.c
-  modules/http2/h2_to_h1.c           modules/http2/h2_util.c
+  modules/http2/h2_push.c            modules/http2/h2_request.c
+  modules/http2/h2_response.c        modules/http2/h2_session.c
+  modules/http2/h2_stream.c          modules/http2/h2_stream_set.c
+  modules/http2/h2_switch.c          modules/http2/h2_task.c
+  modules/http2/h2_task_input.c      modules/http2/h2_task_output.c
+  modules/http2/h2_task_queue.c      modules/http2/h2_util.c
   modules/http2/h2_worker.c          modules/http2/h2_workers.c
 )
 SET(mod_ldap_extra_defines           LDAP_DECLARE_EXPORT)