VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100513 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2011-05-07 11:41:59 +00:00
parent 089dcf8cec
commit 7ae5a61329
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/proxy/ajp_link.c
View File

@ -84,7 +84,7 @@ apr_status_t ajp_ilink_receive(apr_socket_t *sock, ajp_msg_t *msg)
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);

2
modules/proxy/mod_proxy_ajp.c
View File

@ -341,7 +341,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
* 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;
}