]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
authorGraham Leggett <minfrin@apache.org>
Mon, 27 May 2019 12:27:19 +0000 (12:27 +0000)
committerGraham Leggett <minfrin@apache.org>
Mon, 27 May 2019 12:27:19 +0000 (12:27 +0000)
trunk patch: http://svn.apache.org/r1856910
2.4.x patch: svn merge -c 1856910 ^/httpd/httpd/trunk .
+1: icing, covener, ylavic

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

CHANGES
CMakeLists.txt
STATUS

diff --git a/CHANGES b/CHANGES
index a4a296d5f69bf4fb53ec59a491c8e81d3cc79a1a..64f018e7582697a401777670d633b6b584360d3c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.40
 
+  *) mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
+     [Stefan Eissing]
+
   *) mod_proxy/ssl: Proxy SSL client certificate configuration and other proxy
      SSL configurations broken inside <Proxy> context.  PR 63430.
      [Ruediger Pluem, Yann Ylavic]
index eb50eab4daf274e6a64201d56095ef444169976e..8e6d564d6483ed033dbe63b043e13835c91f40c0 100644 (file)
@@ -420,7 +420,7 @@ SET(mod_http2_extra_sources
   modules/http2/h2_mplx.c            modules/http2/h2_push.c
   modules/http2/h2_request.c         modules/http2/h2_headers.c
   modules/http2/h2_session.c         modules/http2/h2_stream.c 
-  modules/http2/h2_switch.c          modules/http2/h2_ngn_shed.c 
+  modules/http2/h2_switch.c
   modules/http2/h2_task.c            modules/http2/h2_util.c
   modules/http2/h2_workers.c
 )
diff --git a/STATUS b/STATUS
index 8f58fa8cb2354a54eb82cd185574a416ad85cb5c..23417649a36569e43e793942a0500e103f14cf28 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -127,11 +127,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
-     trunk patch: http://svn.apache.org/r1856910
-     2.4.x patch: svn merge -c 1856910 ^/httpd/httpd/trunk .
-     +1: icing, covener, ylavic
-
   *) mod_status: PR60647: ACC per connection not available w/ event MPM
      trunk patch: http://svn.apache.org/r1780280
      2.4.x patch: svn merge -c 1780280 ^/httpd/httpd/trunk .