[packages/apache/APACHE_2_2] - rel 8; that way works only for http dummy connection (won't work for https dummy)

arekm arekm at pld-linux.org
Sun Apr 14 18:21:14 CEST 2013


commit e3d9e31226cf11105b2e3b27e56ddc2983ecb92b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Apr 14 18:21:12 2013 +0200

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

 apache.spec                         |  2 +-
 httpd-dummy-connection-result.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 913725a..103be4d 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:	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 a95a559..4d2e3bb 100644
--- 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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/e3d9e31226cf11105b2e3b27e56ddc2983ecb92b



More information about the pld-cvs-commit mailing list