- rel 8; that way works only for http dummy connection (won't work for https dummy)

diff --git a/apache.spec b/apache.spec
index 913725ad654543926b5b3d5e0dcb216cb58da505..103be4de763a822b321930c54d544badd75c1dbc 100644 (file)
--- 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:       7
+Release:       8
 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 a95a5590509ec6039029c81b77c14bf4fbd35619..4d2e3bbde23ffd4d4848d09803f84a13b1fd279a 100644 (file)
--- a/httpd-dummy-connection-result.patch
+++ b/httpd-dummy-connection-result.patch
@@ -1,14 +1,14 @@
 ; http://www.mail-archive.com/dev%40httpd.apache.org/msg56690.html
-diff -ur a/server/mpm_common.c b/server/mpm_common.c
---- a/server/mpm_common.c      2012-07-03 21:38:58.000000000 +0200
-+++ b/server/mpm.common.c      2013-04-12 09:14:58.282929959 +0200
-@@ -604,7 +604,17 @@
+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) {
++    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);