summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2006-07-20 09:31:15 +0000
committerjorton <jorton@fedoraproject.org>2006-07-20 09:31:15 +0000
commit37e4a81dc7a69c04ad023919cd5ce2eaf6598e7a (patch)
treed284127c1a71c49839c50648badfa7f4e7795e4d
parent8395baecec62abdd1ca25859a5f1522bd337cbfc (diff)
downloadhttpd-37e4a81dc7a69c04ad023919cd5ce2eaf6598e7a.tar.gz
httpd-37e4a81dc7a69c04ad023919cd5ce2eaf6598e7a.tar.xz
httpd-37e4a81dc7a69c04ad023919cd5ce2eaf6598e7a.zip
- fix segfault on dummy connection failure at graceful restart (#199429)httpd-2_2_2-8RHEL-5-split
-rw-r--r--httpd-2.1.10-pod.patch2
-rw-r--r--httpd.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/httpd-2.1.10-pod.patch b/httpd-2.1.10-pod.patch
index de61dd6..eb76638 100644
--- a/httpd-2.1.10-pod.patch
+++ b/httpd-2.1.10-pod.patch
@@ -43,7 +43,7 @@ that was actually initialized properly by mod_ssl.
ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf,
- "connect to listener on %pI", ap_listeners->bind_addr);
-+ "connect to listener on %pI", lr);
++ "connect to listener on %pI", lr->bind_addr);
}
/* Create the request string. We include a User-Agent so that
diff --git a/httpd.spec b/httpd.spec
index b50699c..4b91195 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.2
-Release: 7
+Release: 8
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -481,6 +481,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Thu Jul 20 2006 Joe Orton <jorton@redhat.com> 2.2.2-8
+- fix segfault on dummy connection failure at graceful restart (#199429)
+
* Wed Jul 19 2006 Joe Orton <jorton@redhat.com> 2.2.2-7
- fix "apxs -g"-generated Makefile
- fix buildconf with autoconf 2.60