httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r343999 - /httpd/httpd/trunk/server/core_filters.c
Date Sun, 13 Nov 2005 23:15:11 GMT
Author: trawick
Date: Sun Nov 13 15:15:06 2005
New Revision: 343999

URL: http://svn.apache.org/viewcvs?rev=343999&view=rev
Log:
drop dependency on apr_wait_for_io_or_timeout()

Modified:
    httpd/httpd/trunk/server/core_filters.c

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/core_filters.c?rev=343999&r1=343998&r2=343999&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Sun Nov 13 15:15:06 2005
@@ -26,7 +26,6 @@
 #include "apr_hash.h"
 #include "apr_thread_proc.h"    /* for RLIMIT stuff */
 #include "apr_hooks.h"
-#include "apr_support.h"
 
 #define APR_WANT_IOVEC
 #define APR_WANT_STRFUNC
@@ -624,7 +623,17 @@
         rv = send_brigade_nonblocking(s, bb, bytes_written, c);
         if (rv != APR_SUCCESS) {
             if (APR_STATUS_IS_EAGAIN(rv)) {
-                rv = apr_wait_for_io_or_timeout(NULL, s, 0);
+                /* Wait until we can send more data */
+                apr_int32_t nsds;
+                apr_interval_time_t timeout;
+                apr_pollfd_t pollset;
+
+                pollset.p = c->pool;
+                pollset.desc_type = APR_POLL_SOCKET;
+                pollset.reqevents = APR_POLLOUT;
+                pollset.desc.s = s;
+                apr_socket_timeout_get(s, &timeout);
+                rv = apr_poll(&pollset, 1, &nsds, timeout);
                 if (rv != APR_SUCCESS) {
                     break;
                 }



Mime
View raw message