httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1530999 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/core_filters.c
Date Thu, 10 Oct 2013 14:33:00 GMT
Author: jim
Date: Thu Oct 10 14:32:59 2013
New Revision: 1530999

URL: http://svn.apache.org/r1530999
Log:
Merge r1530793 from trunk:

core: Don't truncate output when sending is interrupted by a signal,
      such as from an exiting CGI process.

PR: 55643

Submitted by: trawick
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/core_filters.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1530793

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1530999&r1=1530998&r2=1530999&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Oct 10 14:32:59 2013
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.7
 
+  *) core: Don't truncate output when sending is interrupted by a signal,
+     such as from an exiting CGI process. PR 55643. [Jeff Trawick]
+
   *) Windows: Correct failure to discard stderr in some error log
      configurations.  (Error message AH00093)  [Jeff Trawick]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1530999&r1=1530998&r2=1530999&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Oct 10 14:32:59 2013
@@ -98,12 +98,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * core: Don't truncate output when sending is interrupted by a signal,
-          such as from an exiting CGI process. PR 55643.
-    trunk: https://svn.apache.org/r1530793
-    2.4.x: trunk works
-    +1: trawick, covener, jim
-
   * WinNT MPM: Exit the child if the parent process crashes or is terminated.
     trunk: https://svn.apache.org/r1526666 and r1527220
     2.4.x: trunk patches work if CHANGES are massaged and log-message-tag change

Modified: httpd/httpd/branches/2.4.x/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core_filters.c?rev=1530999&r1=1530998&r2=1530999&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core_filters.c (original)
+++ httpd/httpd/branches/2.4.x/server/core_filters.c Thu Oct 10 14:32:59 2013
@@ -745,7 +745,9 @@ static apr_status_t send_brigade_blockin
                 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;
                 }



Mime
View raw message