httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jean-frederic clere <jfcl...@gmail.com>
Subject Re: svn commit: r1650655 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS modules/proxy/proxy_util.c
Date Mon, 16 Nov 2015 16:53:26 GMT
On 01/09/2015 09:37 PM, jailletc36@apache.org wrote:
> Author: jailletc36
> Date: Fri Jan  9 20:37:50 2015
> New Revision: 1650655
> 
> URL: http://svn.apache.org/r1650655
> Log:
> Merge r1644503 from trunk
> 
>    * mod_proxy_ajp: Fix handling of the default port (8009) in the
>      ProxyPass and <Proxy> configurations.  PR 57259.
> 
> Submitted by: ylavic
> Reviewed by: ylavic, jim, covener
> Backported by: jailletc36
> 
> Modified:
>     httpd/httpd/branches/2.4.x/CHANGES
>     httpd/httpd/branches/2.4.x/STATUS
>     httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
> 
> Modified: httpd/httpd/branches/2.4.x/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1650655&r1=1650654&r2=1650655&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
> +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Jan  9 20:37:50 2015
> @@ -22,6 +22,9 @@ Changes with Apache 2.4.11
>       request headers earlier.  Adds "MergeTrailers" directive to restore
>       legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
>  
> +  *) mod_proxy_ajp: Fix handling of the default port (8009) in the
> +     ProxyPass and <Proxy> configurations.  PR 57259.  [Yann Ylavic].
> +
>    *) mpm_event: Avoid a possible use after free when notifying the end of
>       connection during lingering close.  PR 57268.  [Eric Covener, Yann Ylavic]
>  
> 
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1650655&r1=1650654&r2=1650655&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Fri Jan  9 20:37:50 2015
> @@ -104,12 +104,6 @@ RELEASE SHOWSTOPPERS:
>  PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
>    [ start all new proposals below, under PATCHES PROPOSED. ]
>  
> -   * mod_proxy_ajp: Fix handling of the default port (8009) in the
> -     ProxyPass and <Proxy> configurations.  PR 57259.
> -     trunk patch: http://svn.apache.org/r1644503
> -     2.4.x patch: trunk works (module CHANGES)
> -     +1: ylavic, jim, covener
> -
>     * mod_ssl: Check if we are having an SSL connection before looking up SSL
>                related variables during expression evaluation to avoid a crash.
>                If not return NULL as ssl_var_lookup_ssl does by default.  PR 57070
> 
> Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c?rev=1650655&r1=1650654&r2=1650655&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c (original)
> +++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c Fri Jan  9 20:37:50 2015
> @@ -1683,6 +1683,9 @@ PROXY_DECLARE(char *) ap_proxy_define_wo
>  
>      memset(wshared, 0, sizeof(proxy_worker_shared));
>  
> +    if (uri.port && uri.port == ap_proxy_port_of_scheme(uri.scheme)) {
> +        uri.port = 0;
> +    }


I must be doing something wrong but the above seems to hurt by 30% more
CPU one for the tests we are doing, any hints?

Cheers

Jean-Frederic

Mime
View raw message