[packages/apache/APACHE_2_2] - rel 9; better way of dealing with children at graceful reload
arekm
arekm at pld-linux.org
Fri Nov 15 19:28:38 CET 2013
commit 55046c809b541658a6a28462e66da7c9a2e0e8f7
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Nov 15 19:28:34 2013 +0100
- rel 9; better way of dealing with children at graceful reload
apache.spec | 2 +-
httpd-dummy-connection-result.patch | 34 ++++++++++++----------------------
2 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index fc97ce1..9fcbec8 100644
--- a/apache.spec
+++ b/apache.spec
@@ -44,7 +44,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.2.24
-Release: 8
+Release: 9
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
diff --git a/httpd-dummy-connection-result.patch b/httpd-dummy-connection-result.patch
index 4d2e3bb..6a6eec1 100644
--- a/httpd-dummy-connection-result.patch
+++ b/httpd-dummy-connection-result.patch
@@ -1,23 +1,13 @@
-; http://www.mail-archive.com/dev%40httpd.apache.org/msg56690.html
-diff -ur httpd-2.2.24.org/server/mpm_common.c httpd-2.2.24/server/mpm_common.c
---- httpd-2.2.24.org/server/mpm_common.c 2013-04-14 18:02:48.785876471 +0200
-+++ httpd-2.2.24/server/mpm_common.c 2013-04-14 18:03:39.900458831 +0200
-@@ -739,7 +739,17 @@
- len = strlen(data);
- }
-
-- apr_socket_send(sock, data, &len);
-+ rv = apr_socket_send(sock, data, &len);
-+ if (rv == APR_SUCCESS && lp->protocol && strcasecmp(lp->protocol, "http") == 0) {
-+ char *buffer[10]; // dummy buffer to see if child is alive
-+
-+ len = sizeof(buffer);
-+ rv = apr_socket_recv(sock, buffer, &len);
-+ if (rv != APR_SUCCESS) {
-+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf,
-+ "receiving response to dummy data to listener on %pI", lp->bind_addr);
+--- httpd-2.2.24/server/mpm_common.c~ 2013-11-15 19:03:14.000000000 +0100
++++ httpd-2.2.24/server/mpm_common.c 2013-11-15 19:05:59.513220552 +0100
+@@ -777,6 +777,10 @@
+ * a while serving time-consuming requests)
+ */
+ for (i = 0; i < num && rv == APR_SUCCESS; i++) {
++ if (ap_scoreboard_image->servers[i][0].status != SERVER_READY ||
++ ap_scoreboard_image->servers[i][0].pid == 0) {
++ continue;
+ }
-+ }
- apr_socket_close(sock);
- apr_pool_destroy(p);
-
+ rv = dummy_connection(pod);
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/55046c809b541658a6a28462e66da7c9a2e0e8f7
More information about the pld-cvs-commit
mailing list