You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2011/05/07 13:42:00 UTC
svn commit: r1100513 - in /httpd/httpd/trunk/modules/proxy: ajp_link.c
mod_proxy_ajp.c
Author: covener
Date: Sat May 7 11:41:59 2011
New Revision: 1100513
URL: http://svn.apache.org/viewvc?rev=1100513&view=rev
Log:
replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.
Modified:
httpd/httpd/trunk/modules/proxy/ajp_link.c
httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
Modified: httpd/httpd/trunk/modules/proxy/ajp_link.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_link.c?rev=1100513&r1=1100512&r2=1100513&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_link.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_link.c Sat May 7 11:41:59 2011
@@ -84,7 +84,7 @@ apr_status_t ajp_ilink_receive(apr_socke
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
"ajp_ilink_receive() can't receive header");
- return (status == APR_TIMEUP ? APR_TIMEUP : AJP_ENO_HEADER);
+ return (APR_STATUS_IS_TIMEUP(status) ? APR_TIMEUP : AJP_ENO_HEADER);
}
status = ajp_msg_check_header(msg, &blen);
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=1100513&r1=1100512&r2=1100513&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Sat May 7 11:41:59 2011
@@ -341,7 +341,7 @@ static int ap_proxy_ajp_request(apr_pool
* we assume it is a request that cause a back-end timeout,
* but doesn't affect the whole worker.
*/
- if (status == APR_TIMEUP && conn->worker->s->ping_timeout_set) {
+ if (APR_STATUS_IS_TIMEUP(status) && conn->worker->s->ping_timeout_set) {
return HTTP_GATEWAY_TIME_OUT;
}