From d9bb66566a998f86ca6fe10342f59f328fbd65ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 10 Apr 2013 21:25:54 +0200 Subject: [PATCH] - rel 5; grr hunk fix --- apache-bug-39653.patch | 32 +++++++------------------------- apache.spec | 2 +- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/apache-bug-39653.patch b/apache-bug-39653.patch index a412cfc..dd8ca1e 100644 --- a/apache-bug-39653.patch +++ b/apache-bug-39653.patch @@ -1,21 +1,7 @@ -commit baf08a26b4e3f40491ae9459ef80a7460194c064 -Author: jorton -Date: Fri Dec 12 16:08:16 2008 +0000 - - * server/mpm_common.c (dummy_connection): If possible, use a non-SSL - listening port to use for the dummy connection, to avoid causing - (confusing) error log spam by sending EOF down an SSL port. - - PR: 39653 - - - git-svn-id: http://svn.apache.org/repos/asf/httpd/httpd/trunk@726065 13f79535-47bb-0310-9956-ffa450edef68 - -diff --git a/server/mpm_common.c b/server/mpm_common.c -index f5941f5..72b0e66 100644 ---- a/server/mpm_common.c -+++ b/server/mpm_common.c -@@ -657,6 +657,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod) +diff -urp 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-02-16 23:51:16.000000000 +0100 ++++ httpd-2.2.24/server/mpm_common.c 2013-04-10 21:25:06.322056566 +0200 +@@ -648,6 +648,7 @@ static apr_status_t dummy_connection(ap_ apr_socket_t *sock; apr_pool_t *p; apr_size_t len; @@ -23,7 +9,7 @@ index f5941f5..72b0e66 100644 /* create a temporary pool for the socket. pconf stays around too long */ rv = apr_pool_create(&p, pod->p); -@@ -664,8 +665,19 @@ static apr_status_t dummy_connection(ap_pod_t *pod) +@@ -655,8 +656,19 @@ static apr_status_t dummy_connection(ap_ return rv; } @@ -45,7 +31,7 @@ index f5941f5..72b0e66 100644 if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, "get socket to connect to listener"); -@@ -688,7 +700,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod) +@@ -679,7 +691,7 @@ static apr_status_t dummy_connection(ap_ return rv; } @@ -54,7 +40,7 @@ index f5941f5..72b0e66 100644 if (rv != APR_SUCCESS) { int log_level = APLOG_WARNING; -@@ -704,7 +704,7 @@ static apr_status_t dummy_connection(ap_ +@@ -692,12 +704,12 @@ static apr_status_t dummy_connection(ap_ } ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf, @@ -63,10 +49,6 @@ index f5941f5..72b0e66 100644 apr_pool_destroy(p); 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) { diff --git a/apache.spec b/apache.spec index 66905c1..fad2c46 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: 4 +Release: 5 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz -- 2.44.0