From: Stefan Eissing <icing@apache.org>
Date: Thu, 8 Nov 2018 10:14:04 +0000 (+0000)
Subject: removing unwanted file change
X-Git-Tag: 2.4.38~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52b17a99a7768c6281382e19cba0386ccfaa997c;p=thirdparty%2Fapache%2Fhttpd.git

removing unwanted file change

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

diff --git a/STATUS b/STATUS
index f94eba06d91..3b4982d1f4b 100644
--- a/STATUS
+++ b/STATUS
@@ -208,11 +208,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1845768 ^/httpd/httpd/trunk .
      +1: icing, jim
 
-  *) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2
-     connections.
-     trunk patch: http://svn.apache.org/r1846112
-     2.4.x patch: svn merge -c 1846112 ^/httpd/httpd/trunk .
-     +1: icing, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
index bb62008190b..2e956593aa2 100644
--- a/modules/http2/h2_conn.c
+++ b/modules/http2/h2_conn.c
@@ -354,7 +354,6 @@ apr_status_t h2_slave_run_pre_connection(conn_rec *slave, apr_socket_t *csd)
          * (Not necessarily in pre_connection, but later. Set it here, so it
          * is in place.) */
         slave->keepalives = 1;
-        slave->keepalive = AP_CONN_CLOSE;
         return ap_run_pre_connection(slave, csd);
     }
     return APR_SUCCESS;