From cae244d78e5ed29f6090b224cd7db79606a5b71a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 26 2018 15:01:26 +0000
Subject: import httpd-2.4.6-80.el7_5.1


---

diff --git a/.gitignore b/.gitignore
index 260a2d6..9969f1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 SOURCES/httpd-2.4.6.tar.bz2
-SOURCES/centos-noindex.tar.gz
diff --git a/.httpd.metadata b/.httpd.metadata
index 17ede1b..d335a99 100644
--- a/.httpd.metadata
+++ b/.httpd.metadata
@@ -1,2 +1 @@
 16d8ec72535ded65d035122b0d944b0e64eaa2a2 SOURCES/httpd-2.4.6.tar.bz2
-6ce5ab3c765b9efeceb2e636e32373bc6e6ed489 SOURCES/centos-noindex.tar.gz
diff --git a/SOURCES/httpd-2.4.6-r1530999.patch b/SOURCES/httpd-2.4.6-r1530999.patch
new file mode 100644
index 0000000..2c13959
--- /dev/null
+++ b/SOURCES/httpd-2.4.6-r1530999.patch
@@ -0,0 +1,19 @@
+# ./pullrev.sh 1530999
+
+http://svn.apache.org/viewvc?view=revision&revision=1530999
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1557785
+
+--- httpd-2.4.6/server/core_filters.c
++++ httpd-2.4.6/server/core_filters.c
+@@ -745,7 +745,9 @@
+                 pollset.reqevents = APR_POLLOUT;
+                 pollset.desc.s = s;
+                 apr_socket_timeout_get(s, &timeout);
+-                rv = apr_poll(&pollset, 1, &nsds, timeout);
++                do {
++                    rv = apr_poll(&pollset, 1, &nsds, timeout);
++                } while (APR_STATUS_IS_EINTR(rv));
+                 if (rv != APR_SUCCESS) {
+                     break;
+                 }
diff --git a/SOURCES/welcome.conf b/SOURCES/welcome.conf
index c1b6c11..5d1e452 100644
--- a/SOURCES/welcome.conf
+++ b/SOURCES/welcome.conf
@@ -16,7 +16,3 @@
 </Directory>
 
 Alias /.noindex.html /usr/share/httpd/noindex/index.html
-Alias /noindex/css/bootstrap.min.css /usr/share/httpd/noindex/css/bootstrap.min.css
-Alias /noindex/css/open-sans.css /usr/share/httpd/noindex/css/open-sans.css
-Alias /images/apache_pb.gif /usr/share/httpd/noindex/images/apache_pb.gif
-Alias /images/poweredby.png /usr/share/httpd/noindex/images/poweredby.png
diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec
index cb519f6..0d2139a 100644
--- a/SPECS/httpd.spec
+++ b/SPECS/httpd.spec
@@ -4,7 +4,7 @@
 %define mmn 20120211
 %define oldmmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
 %define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
-%define vstring CentOS
+%define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT})
 
 # Drop automatic provides for module DSOs
 %{?filter_setup:
@@ -15,10 +15,10 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.6
-Release: 80%{?dist}
+Release: 80%{?dist}.1
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-Source1: centos-noindex.tar.gz
+Source1: index.html
 Source2: httpd.logrotate
 Source3: httpd.sysconf
 Source4: httpd-ssl-pass-dialog
@@ -172,6 +172,8 @@ Patch129: httpd-2.4.6-r1811746.patch
 Patch130: httpd-2.4.6-r1811976.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1506392
 Patch131: httpd-2.4.6-r1650310.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1557785
+Patch132: httpd-2.4.6-r1530999.patch
 
 # Security fixes
 Patch200: httpd-2.4.6-CVE-2013-6438.patch
@@ -407,6 +409,7 @@ rm modules/ssl/ssl_engine_dh.c
 %patch129 -p1 -b .r1811746
 %patch130 -p1 -b .r1811976
 %patch131 -p1 -b .r1650310
+%patch132 -p1 -b .r1530999
 
 %patch200 -p1 -b .cve6438
 %patch201 -p1 -b .cve0098
@@ -582,10 +585,8 @@ EOF
 
 # Handle contentdir
 mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
-tar xzf $RPM_SOURCE_DIR/centos-noindex.tar.gz \
-        -C $RPM_BUILD_ROOT%{contentdir}/noindex/ \
-        --strip-components=1
-
+install -m 644 -p $RPM_SOURCE_DIR/index.html \
+        $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
 rm -rf %{contentdir}/htdocs
 
 # remove manual sources
@@ -608,7 +609,7 @@ rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
       $RPM_BUILD_ROOT%{docroot}/cgi-bin/*
 
 # Symlink for the powered-by-$DISTRO image:
-ln -s ../noindex/images/poweredby.png \
+ln -s ../../pixmaps/poweredby.png \
         $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
 
 # symlinks for /etc/httpd
@@ -794,7 +795,7 @@ rm -rf $RPM_BUILD_ROOT
 %{contentdir}/error/README
 %{contentdir}/error/*.var
 %{contentdir}/error/include/*.html
-%{contentdir}/noindex/*
+%{contentdir}/noindex/index.html
 
 %dir %{docroot}
 %dir %{docroot}/cgi-bin
@@ -860,11 +861,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
-* Tue Apr 10 2018 CentOS Sources <bugs@centos.org> - 2.4.6-80.el7.centos
-- Remove index.html, add centos-noindex.tar.gz
-- change vstring
-- change symlink for poweredby.png
-- update welcome.conf with proper aliases
+* Mon May 28 2018 Luboš Uhliarik <luhliari@redhat.com> - 2.4.6-80.1
+- Resolves: #1560609 - httpd: active connections being terminated when httpd
+  gets gracefully stopped/restarted, GracefulShutdownTimeout is not being
+  honored
 
 * Mon Jan 08 2018 Luboš Uhliarik <luhliari@redhat.com> - 2.4.6-80
 - Related: #1288395 - httpd segfault when logrotate invoked