rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

pull upstream patch r1392850 in addition to r1387633

Browse Source
This commit is contained in:
Joe Orton 2012-10-03 13:50:44 +01:00
parent b98f20799d
commit c6e80d081a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
httpd-2.4.2-r1387633.patch → httpd-2.4.3-r1387633+.patch
View File

@ -1,15 +1,17 @@
# ./pullrev.sh 1387633 # ./pullrev.sh 1387633 1392850
http://svn.apache.org/viewvc?view=revision&revision=1387633 http://svn.apache.org/viewvc?view=revision&revision=1387633
http://svn.apache.org/viewvc?view=revision&revision=1392850
--- httpd-2.4.2/server/mpm/prefork/prefork.c --- httpd-2.4.3/server/mpm/prefork/prefork.c
+++ httpd-2.4.2/server/mpm/prefork/prefork.c +++ httpd-2.4.3/server/mpm/prefork/prefork.c
@@ -564,8 +564,14 @@ @@ -564,9 +564,16 @@
status = apr_pollset_add(pollset, &pfd); status = apr_pollset_add(pollset, &pfd);
if (status != APR_SUCCESS) { if (status != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157) - ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157)
- "Couldn't add listener to pollset; check system or user limits"); - "Couldn't add listener to pollset; check system or user limits");
- clean_child_exit(APEXIT_CHILDSICK);
+ /* If the child processed a SIGWINCH before setting up the + /* If the child processed a SIGWINCH before setting up the
+ * pollset, this error path is expected and harmless, + * pollset, this error path is expected and harmless,
+ * since the listener fd was already closed; so don't + * since the listener fd was already closed; so don't
@ -17,7 +19,9 @@ http://svn.apache.org/viewvc?view=revision&revision=1387633
+ if (!die_now) { + if (!die_now) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157) + ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157)
+ "Couldn't add listener to pollset; check system or user limits"); + "Couldn't add listener to pollset; check system or user limits");
+ clean_child_exit(APEXIT_CHILDSICK);
+ } + }
clean_child_exit(APEXIT_CHILDSICK); + clean_child_exit(0);
} }
lr->accept_func = ap_unixd_accept;

7
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.3 Version: 2.4.3
Release: 9%{?dist} Release: 10%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -52,7 +52,7 @@ Patch28: httpd-2.4.2-r1332643+.patch
Patch29: httpd-2.4.3-mod_systemd.patch Patch29: httpd-2.4.3-mod_systemd.patch
# Bug fixes # Bug fixes
Patch50: httpd-2.4.2-r1374214+.patch Patch50: httpd-2.4.2-r1374214+.patch
Patch51: httpd-2.4.2-r1387633.patch Patch51: httpd-2.4.3-r1387633+.patch
License: ASL 2.0 License: ASL 2.0
Group: System Environment/Daemons Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -574,6 +574,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Wed Oct 3 2012 Joe Orton <jorton@redhat.com> - 2.4.3-10
- pull upstream patch r1392850 in addition to r1387633
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-9 * Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-9
- define PLATFORM in os.h using vendor string - define PLATFORM in os.h using vendor string