From: Joe Orton <jorton@apache.org>
Date: Wed, 15 Jan 2020 17:43:42 +0000 (+0000)
Subject: Simplified mod_systemd backport proposal w/o IdleShutdown feature.
X-Git-Tag: 2.4.42~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de77a8db1477e13157001ecc53cdecd77bb0b14;p=thirdparty%2Fapache%2Fhttpd.git

Simplified mod_systemd backport proposal w/o IdleShutdown feature.
Note partial merge of some commits, socket activation changes are
excluded.  mod_systemd.c as proposed is exactly as in trunk.


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

diff --git a/STATUS b/STATUS
index 3ff12d9dafe..23dcc6fdd8d 100644
--- a/STATUS
+++ b/STATUS
@@ -228,6 +228,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1872786 ^/httpd/httpd/trunk
      +1: jim
 
+   * mod_systemd: New module, for integration with systemd on Linux.
+     trunk patch: http://svn.apache.org/r1393976
+                  http://svn.apache.org/r1393997
+                  http://svn.apache.org/r1484554
+                  http://svn.apache.org/r1528032
+                  http://svn.apache.org/r1528034
+                  http://svn.apache.org/r1614821
+                  http://svn.apache.org/r1618579
+                  http://svn.apache.org/r1618588
+                  http://svn.apache.org/r1802251
+                  http://svn.apache.org/r1840554
+                  http://svn.apache.org/r1840555
+                  http://svn.apache.org/r1872761
+                  http://svn.apache.org/r1872763
+     2.4.x patch: http://people.apache.org/~jorton/httpd-2.4.x-mod_systemd.patch
+     +1: jorton,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
 
@@ -480,20 +497,3 @@ PATCHES/ISSUES THAT ARE STALLED
              needed if the above configure.in proposal gets backported.
              Note that r1812339 could be backported in any case, even if
              the above configure.in proposal does not get accepted.
-
-   * mod_systemd: New module, for integration with systemd on Linux.
-     trunk patch: http://svn.apache.org/r1393976
-                  http://svn.apache.org/r1393997
-                  http://svn.apache.org/r1484554
-                  http://svn.apache.org/r1528032
-                  http://svn.apache.org/r1528034
-                  http://svn.apache.org/r1614821
-                  http://svn.apache.org/r1618579
-                  http://svn.apache.org/r1618588
-     2.4.x patch: http://people.apache.org/~jkaluza/patches/mod_systemd/httpd-2.4.x-mod_systemd.patch
-     +1: jkaluza
-     sf comments: The IdleShutdown logic seems broken. Consider a single
-                  active connection that is stalled for 10 seconds. That
-                  connection will be broken after GracefulShutdownTimeout.
-                  A better logic would be to check if there is any open
-                  connection that is not in keep-alive state.