www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

mod_proxy_{connect,wstunnel}: follow up to r1657636.

Browse Source 
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669130 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-03-25 15:00:37 +00:00
parent 7840147f5e
commit 549749d283
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/proxy/mod_proxy_connect.c
View File

@@ -203,6 +203,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
apr_socket_t *sock; apr_socket_t *sock;
conn_rec *c = r->connection; conn_rec *c = r->connection;
conn_rec *backconn; conn_rec *backconn;
int done = 0;
apr_bucket_brigade *bb = apr_brigade_create(p, c->bucket_alloc); apr_bucket_brigade *bb = apr_brigade_create(p, c->bucket_alloc);
apr_status_t rv; apr_status_t rv;
@@ -413,7 +414,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
r->proto_input_filters = c->input_filters; r->proto_input_filters = c->input_filters;
/* r->sent_bodyct = 1;*/ /* r->sent_bodyct = 1;*/
while (1) { /* Infinite loop until error (one side closes the connection) */ do { /* Loop until done (one side closes the connection, or an error) */
rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled); rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
if (APR_STATUS_IS_EINTR(rv)) { if (APR_STATUS_IS_EINTR(rv)) {
@@ -438,13 +439,14 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01025) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01025)
"sock was readable"); "sock was readable");
#endif #endif
rv |= proxy_connect_transfer(r, backconn, c, bb, "sock"); done |= proxy_connect_transfer(r, backconn, c, bb,
"sock") != APR_SUCCESS;
} }
else if (pollevent & APR_POLLERR) { else if (pollevent & APR_POLLERR) {
rv |= APR_EPIPE;
backconn->aborted = 1;
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(01026) ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(01026)
"err on backconn"); "err on backconn");
backconn->aborted = 1;
done = 1;
} }
} }
else if (cur->desc.s == client_socket) { else if (cur->desc.s == client_socket) {
@@ -454,26 +456,24 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01027) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01027)
"client was readable"); "client was readable");
#endif #endif
rv |= proxy_connect_transfer(r, c, backconn, bb, "client"); done |= proxy_connect_transfer(r, c, backconn, bb,
"client") != APR_SUCCESS;
} }
else if (pollevent & APR_POLLERR) { else if (pollevent & APR_POLLERR) {
rv |= APR_EPIPE;
c->aborted = 1;
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02827) ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02827)
"err on client"); "err on client");
c->aborted = 1;
done = 1;
} }
} }
else { else {
rv |= APR_EBADF;
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01028) ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01028)
"unknown socket in pollset"); "unknown socket in pollset");
done = 1;
} }
} }
if (rv != APR_SUCCESS) { } while (!done);
break;
}
}
ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
"finished with poll() - cleaning up"); "finished with poll() - cleaning up");

28
modules/proxy/mod_proxy_wstunnel.c
View File

@@ -53,8 +53,9 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_as
apr_socket_t *client_socket = baton->client_soc; apr_socket_t *client_socket = baton->client_soc;
apr_status_t rv; apr_status_t rv;
apr_bucket_brigade *bb = baton->bb; apr_bucket_brigade *bb = baton->bb;
int done = 0;
while(1) { do {
rv = apr_pollset_poll(pollset, timeout, &pollcnt, &signalled); rv = apr_pollset_poll(pollset, timeout, &pollcnt, &signalled);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
if (APR_STATUS_IS_EINTR(rv)) { if (APR_STATUS_IS_EINTR(rv)) {
@@ -86,18 +87,19 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_as
if (pollevent & (APR_POLLIN | APR_POLLHUP)) { if (pollevent & (APR_POLLIN | APR_POLLHUP)) {
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02446) ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02446)
"sock was readable"); "sock was readable");
rv |= proxy_wstunnel_transfer(r, backconn, c, bb, "sock"); done |= proxy_wstunnel_transfer(r, backconn, c, bb,
"sock") != APR_SUCCESS;
} }
else if (pollevent & APR_POLLERR) { else if (pollevent & APR_POLLERR) {
rv |= APR_EPIPE;
backconn->aborted = 1;
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02447) ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02447)
"error on backconn"); "error on backconn");
backconn->aborted = 1;
done = 1;
} }
else { else {
rv |= APR_EGENERAL;
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02605) ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02605)
"unknown event on backconn %d", pollevent); "unknown event on backconn %d", pollevent);
done = 1;
} }
} }
else if (cur->desc.s == client_socket) { else if (cur->desc.s == client_socket) {
@@ -105,32 +107,30 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_as
if (pollevent & (APR_POLLIN | APR_POLLHUP)) { if (pollevent & (APR_POLLIN | APR_POLLHUP)) {
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02448) ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02448)
"client was readable"); "client was readable");
rv |= proxy_wstunnel_transfer(r, c, backconn, bb, "client"); done |= proxy_wstunnel_transfer(r, c, backconn, bb,
"client") != APR_SUCCESS;
} }
else if (pollevent & APR_POLLERR) { else if (pollevent & APR_POLLERR) {
rv |= APR_EPIPE;
c->aborted = 1;
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02607) ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02607)
"error on client conn"); "error on client conn");
c->aborted = 1;
done = 1;
} }
else { else {
rv |= APR_EGENERAL;
ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02606) ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02606)
"unknown event on client conn %d", pollevent); "unknown event on client conn %d", pollevent);
done = 1;
} }
} }
else { else {
rv |= APR_EBADF;
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02449) ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02449)
"unknown socket in pollset"); "unknown socket in pollset");
done = 1;
} }
} }
if (rv != APR_SUCCESS) { } while (!done);
break;
}
}
ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
"finished with poll() - cleaning up"); "finished with poll() - cleaning up");