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

Clean up nasty formatting

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571879 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2007-09-01 21:42:30 +00:00
parent 05cab47457
commit f4b856b17b
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/proxy/mod_proxy_connect.c
View File

@@ -113,8 +113,8 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
/* we break the URL into host, port, uri */ /* we break the URL into host, port, uri */
if (APR_SUCCESS != apr_uri_parse_hostinfo(p, url, &uri)) { if (APR_SUCCESS != apr_uri_parse_hostinfo(p, url, &uri)) {
return ap_proxyerror(r, HTTP_BAD_REQUEST, return ap_proxyerror(r, HTTP_BAD_REQUEST, apr_pstrcat(p,
apr_pstrcat(p, "URI cannot be parsed: ", url, NULL)); "URI cannot be parsed: ", url, NULL));
} }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
@@ -145,24 +145,24 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
/* check if ProxyBlock directive on this host */ /* check if ProxyBlock directive on this host */
if (OK != ap_proxy_checkproxyblock(r, conf, uri_addr)) { if (OK != ap_proxy_checkproxyblock(r, conf, uri_addr)) {
return ap_proxyerror(r, HTTP_FORBIDDEN, return ap_proxyerror(r, HTTP_FORBIDDEN,
"Connect to remote machine blocked"); "Connect to remote machine blocked");
} }
/* Check if it is an allowed port */ /* Check if it is an allowed port */
if (conf->allowed_connect_ports->nelts == 0) { if (conf->allowed_connect_ports->nelts == 0) {
/* Default setting if not overridden by AllowCONNECT */ /* Default setting if not overridden by AllowCONNECT */
switch (uri.port) { switch (uri.port) {
case APR_URI_HTTPS_DEFAULT_PORT: case APR_URI_HTTPS_DEFAULT_PORT:
case APR_URI_SNEWS_DEFAULT_PORT: case APR_URI_SNEWS_DEFAULT_PORT:
break; break;
default: default:
/* XXX can we call ap_proxyerror() here to get a nice log message? */ /* XXX can we call ap_proxyerror() here to get a nice log message? */
return HTTP_FORBIDDEN; return HTTP_FORBIDDEN;
} }
} else if(!allowed_port(conf, uri.port)) { } else if(!allowed_port(conf, uri.port)) {
/* XXX can we call ap_proxyerror() here to get a nice log message? */ /* XXX can we call ap_proxyerror() here to get a nice log message? */
return HTTP_FORBIDDEN; return HTTP_FORBIDDEN;
} }
/* /*
@@ -175,7 +175,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
* until we get a successful connection * until we get a successful connection
*/ */
if (APR_SUCCESS != err) { if (APR_SUCCESS != err) {
return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p, return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
"DNS lookup failure for: ", "DNS lookup failure for: ",
connectname, NULL)); connectname, NULL));
} }
@@ -266,9 +266,8 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
/* r->sent_bodyct = 1;*/ /* r->sent_bodyct = 1;*/
if ((rv = apr_pollset_create(&pollset, 2, r->pool, 0)) != APR_SUCCESS) if ((rv = apr_pollset_create(&pollset, 2, r->pool, 0)) != APR_SUCCESS) {
{ apr_socket_close(sock);
apr_socket_close(sock);
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"proxy: CONNECT: error apr_pollset_create()"); "proxy: CONNECT: error apr_pollset_create()");
return HTTP_INTERNAL_SERVER_ERROR; return HTTP_INTERNAL_SERVER_ERROR;
@@ -288,7 +287,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
while (1) { /* Infinite loop until error (one side closes the connection) */ while (1) { /* Infinite loop until error (one side closes the connection) */
if ((rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled)) != APR_SUCCESS) { if ((rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled)) != APR_SUCCESS) {
apr_socket_close(sock); apr_socket_close(sock);
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: CONNECT: error apr_poll()"); ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: CONNECT: error apr_poll()");
return HTTP_INTERNAL_SERVER_ERROR; return HTTP_INTERNAL_SERVER_ERROR;
} }