httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r1729507 - in /httpd/httpd/trunk/modules: http2/mod_proxy_http2.c proxy/mod_proxy.c proxy/mod_proxy.h proxy/mod_proxy_ajp.c proxy/mod_proxy_http.c proxy/mod_proxy_wstunnel.c
Date Wed, 10 Feb 2016 19:21:05 GMT


On 02/10/2016 12:38 AM, ylavic@apache.org wrote:
> Author: ylavic
> Date: Tue Feb  9 23:38:59 2016
> New Revision: 1729507
> 
> URL: http://svn.apache.org/viewvc?rev=1729507&view=rev
> Log:
> mod_proxy: axe negative "ping" parameter setting and handling.
> This used to check for the backend connection readability only (instead of
> the full ping/100-continue round-trip), but the case is already handled by
> ap_proxy_connect_backend() which is always called.
> 
> Modified:
>     httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
>     httpd/httpd/trunk/modules/proxy/mod_proxy.c
>     httpd/httpd/trunk/modules/proxy/mod_proxy.h
>     httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
>     httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
>     httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
> 

> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1729507&r1=1729506&r2=1729507&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Tue Feb  9 23:38:59 2016

> @@ -463,15 +462,13 @@ static int proxy_wstunnel_handler(reques
>      backend->is_ssl = is_ssl;
>      backend->close = 0;
>  
> -    retry = 0;
> -    while (retry < 2) {
> +    do { /* while (0): break out */
>          char *locurl = url;
>          /* Step One: Determine Who To Connect To */
>          status = ap_proxy_determine_connection(p, r, conf, worker, backend,
>                                                 uri, &locurl, proxyname, proxyport,
>                                                 server_portstr,
>                                                 sizeof(server_portstr));
> -
>          if (status != OK)
>              break;
>  
> @@ -495,8 +492,7 @@ static int proxy_wstunnel_handler(reques
>          /* Step Three: Process the Request */
>          status = proxy_wstunnel_request(p, r, backend, worker, conf, uri, locurl,
>                                        server_portstr, scheme);
> -        break;
> -    }
> +    } while (0);

Do you keep this loop just to keep the formating?

Regards

RĂ¼diger


Mime
View raw message