You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@apache.org on 2010/04/12 20:12:43 UTC
svn commit: r933341 - in /httpd/httpd/trunk/modules:
filters/mod_reqtimeout.c proxy/mod_proxy_fdpass.c
Author: bjh
Date: Mon Apr 12 18:12:43 2010
New Revision: 933341
URL: http://svn.apache.org/viewvc?rev=933341&view=rev
Log:
Remove usage of the APR private function apr_wait_for_io_or_timeout(),
replacing it with the newly added apr_socket_wait().
Modified:
httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=933341&r1=933340&r2=933341&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Mon Apr 12 18:12:43 2010
@@ -24,7 +24,6 @@
#include "util_filter.h"
#define APR_WANT_STRFUNC
#include "apr_strings.h"
-#include "apr_support.h"
module AP_MODULE_DECLARE_DATA reqtimeout_module;
@@ -219,7 +218,7 @@ static apr_status_t reqtimeout_filter(ap
}
/* ... and wait for more */
- rv = apr_wait_for_io_or_timeout(NULL, ccfg->socket, 1);
+ rv = apr_socket_wait(ccfg->socket, APR_WAIT_READ);
if (rv != APR_SUCCESS)
break;
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c?rev=933341&r1=933340&r2=933341&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c Mon Apr 12 18:12:43 2010
@@ -24,9 +24,6 @@
#error This module only works on unix platforms with the correct OS support
#endif
-/* for apr_wait_for_io_or_timeout */
-#include "apr_support.h"
-
#include "mod_proxy_fdpass.h"
module AP_MODULE_DECLARE_DATA proxy_fdpass_module;
@@ -76,7 +73,7 @@ static apr_status_t socket_connect_un(ap
if ((rv == -1) && (errno == EINPROGRESS || errno == EALREADY)
&& (t > 0)) {
- rv = apr_wait_for_io_or_timeout(NULL, sock, 0);
+ rv = apr_socket_wait(sock, APR_WAIT_WRITE);
if (rv != APR_SUCCESS) {
return rv;
}
Re: svn commit: r933341 - in /httpd/httpd/trunk/modules: filters/mod_reqtimeout.c
proxy/mod_proxy_fdpass.c
Posted by Brian Havard <br...@gmail.com>.
Brian Havard wrote:
> Jeff Trawick wrote:
>> On Mon, Apr 12, 2010 at 2:12 PM, <bj...@apache.org> wrote:
>>
>>> Author: bjh
>>> Date: Mon Apr 12 18:12:43 2010
>>> New Revision: 933341
>>>
>>> URL: http://svn.apache.org/viewvc?rev=933341&view=rev
>>> Log:
>>> Remove usage of the APR private function apr_wait_for_io_or_timeout(),
>>> replacing it with the newly added apr_socket_wait().
>>>
>>
>> httpd trunk works (or should work) with apr 1.4.x ;)
>>
>> (conditional logic :( )
>>
>
> Oh, ok, I can do that...
I just tried to commit a fix but it seems that the eu svn mirror is out
of sync, causing my commit to fail ("the specified baseline is not the
latest baseline"). According to http://svn.us.apache.org/viewvc/ the
latest revision is 933536 but http://svn.eu.apache.org/viewvc/ only has
933516.
Who looks after the syncing of these?
Re: svn commit: r933341 - in /httpd/httpd/trunk/modules: filters/mod_reqtimeout.c
proxy/mod_proxy_fdpass.c
Posted by Brian Havard <br...@gmail.com>.
Jeff Trawick wrote:
> On Mon, Apr 12, 2010 at 2:12 PM, <bj...@apache.org> wrote:
>
>> Author: bjh
>> Date: Mon Apr 12 18:12:43 2010
>> New Revision: 933341
>>
>> URL: http://svn.apache.org/viewvc?rev=933341&view=rev
>> Log:
>> Remove usage of the APR private function apr_wait_for_io_or_timeout(),
>> replacing it with the newly added apr_socket_wait().
>>
>
> httpd trunk works (or should work) with apr 1.4.x ;)
>
> (conditional logic :( )
>
Oh, ok, I can do that...
Re: svn commit: r933341 - in /httpd/httpd/trunk/modules:
filters/mod_reqtimeout.c proxy/mod_proxy_fdpass.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, Apr 12, 2010 at 2:12 PM, <bj...@apache.org> wrote:
> Author: bjh
> Date: Mon Apr 12 18:12:43 2010
> New Revision: 933341
>
> URL: http://svn.apache.org/viewvc?rev=933341&view=rev
> Log:
> Remove usage of the APR private function apr_wait_for_io_or_timeout(),
> replacing it with the newly added apr_socket_wait().
httpd trunk works (or should work) with apr 1.4.x ;)
(conditional logic :( )