From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 10 Apr 2013 19:10:40 +0000 (+0200)
Subject: - rel 4; one missing hunk added
X-Git-Tag: auto/th/apache-2.2.24-4
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=6b0efdb85b1ef8c3a7e7cb2920589515fbefbf12;p=packages%2Fapache.git

- rel 4; one missing hunk added
---

diff --git a/apache-bug-39653.patch b/apache-bug-39653.patch
index b3aad6b..a412cfc 100644
--- a/apache-bug-39653.patch
+++ b/apache-bug-39653.patch
@@ -64,3 +64,12 @@ index f5941f5..72b0e66 100644
          return rv;
      }
 
+@@ -709,7 +709,7 @@ static apr_status_t dummy_connection(ap_
+         return rv;
+     }
+ 
+-    if (ap_listeners->protocol && strcasecmp(ap_listeners->protocol, "https") == 0) {
++    if (lp->protocol && strcasecmp(lp->protocol, "https") == 0) {
+         /* Send a TLS 1.0 close_notify alert.  This is perhaps the
+          * "least wrong" way to open and cleanly terminate an SSL
+          * connection.  It should "work" without noisy error logs if
diff --git a/apache.spec b/apache.spec
index 1db4246..66905c1 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:	3
+Release:	4
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz