From: Graham Leggett <minfrin@apache.org>
Date: Mon, 27 May 2019 12:27:19 +0000 (+0000)
Subject: mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
X-Git-Tag: 2.4.40~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b31b56ace724ebd74948eac66161771cd6179253;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/CHANGES b/CHANGES
index a4a296d5f69..64f018e7582 100644
--- 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]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb50eab4daf..8e6d564d648 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 8f58fa8cb23..23417649a36 100644
--- 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 .