packages: apache/apache.spec, apache/apache-bug-41743.patch (NEW) - rel 8; ...
arekm
arekm at pld-linux.org
Sun Feb 13 19:53:10 CET 2011
Author: arekm Date: Sun Feb 13 18:53:10 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 8; fix graceful restart for keepalive connections
---- Files affected:
packages/apache:
apache.spec (1.614 -> 1.615) , apache-bug-41743.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.614 packages/apache/apache.spec:1.615
--- packages/apache/apache.spec:1.614 Wed Feb 2 16:58:22 2011
+++ packages/apache/apache.spec Sun Feb 13 19:53:04 2011
@@ -42,7 +42,7 @@
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.2.17
-Release: 7
+Release: 8
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -98,6 +98,7 @@
# http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
Patch25: httpd-2.2.x-mod_ssl-sessioncaching.patch
Patch26: apache-mod_vhost_alias_docroot.patch
+Patch27: apache-bug-41743.patch
URL: http://httpd.apache.org/
BuildRequires: apr-devel >= 1:1.2
BuildRequires: apr-util-devel >= 1:1.3
@@ -1787,6 +1788,7 @@
%patch24 -p1
%patch25 -p1
%patch26 -p1
+%patch27 -p0
# using system apr, apr-util and pcre
rm -rf srclib/{apr,apr-util,pcre}
@@ -2776,6 +2778,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.615 2011/02/13 18:53:04 arekm
+- rel 8; fix graceful restart for keepalive connections
+
Revision 1.614 2011/02/02 15:58:22 glen
- release 7
================================================================
Index: packages/apache/apache-bug-41743.patch
diff -u /dev/null packages/apache/apache-bug-41743.patch:1.1
--- /dev/null Sun Feb 13 19:53:10 2011
+++ packages/apache/apache-bug-41743.patch Sun Feb 13 19:53:04 2011
@@ -0,0 +1,42 @@
+Index: server/mpm/prefork/prefork.c
+===================================================================
+--- server/mpm/prefork/prefork.c (wersja 1069427)
++++ server/mpm/prefork/prefork.c (wersja 1069428)
+@@ -330,6 +330,7 @@
+
+ static void stop_listening(int sig)
+ {
++ mpm_state = AP_MPMQ_STOPPING;
+ ap_close_listeners();
+
+ /* For a graceful stop, we want the child to exit when done */
+@@ -350,6 +351,7 @@
+ */
+ return;
+ }
++ mpm_state = AP_MPMQ_STOPPING;
+ shutdown_pending = 1;
+ is_graceful = (sig == AP_SIG_GRACEFUL_STOP);
+ }
+@@ -363,6 +365,7 @@
+ /* Probably not an error - don't bother reporting it */
+ return;
+ }
++ mpm_state = AP_MPMQ_STOPPING;
+ restart_pending = 1;
+ is_graceful = (sig == AP_SIG_GRACEFUL);
+ }
+@@ -458,8 +461,10 @@
+
+ int ap_graceful_stop_signalled(void)
+ {
+- /* not ever called anymore... */
+- return 0;
++ /* Return true if the server is stopping for whatever reason; the
++ * function is used to initiate a fast exit from the connection
++ * processing loop. */
++ return mpm_state == AP_MPMQ_STOPPING;
+ }
+
+
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.614&r2=1.615&f=u
More information about the pld-cvs-commit
mailing list