You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/03/02 10:51:05 UTC

svn commit: r1733239 - /httpd/httpd/trunk/modules/proxy/proxy_util.c

Author: icing
Date: Wed Mar  2 09:51:05 2016
New Revision: 1733239

URL: http://svn.apache.org/viewvc?rev=1733239&view=rev
Log:
adding default port numbers for h2/h2x proxy schemes, by jchampion

Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1733239&r1=1733238&r2=1733239&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Mar  2 09:51:05 2016
@@ -3681,6 +3681,8 @@ static proxy_schemes_t pschemes[] =
     {"fcgi",     8000},
     {"ajp",      AJP13_DEF_PORT},
     {"scgi",     SCGI_DEF_PORT},
+    {"h2c",      DEFAULT_HTTP_PORT},
+    {"h2",       DEFAULT_HTTPS_PORT},
     { NULL, 0xFFFF }     /* unknown port */
 };
 



Re: svn commit: r1733239 - /httpd/httpd/trunk/modules/proxy/proxy_util.c

Posted by Stefan Eissing <st...@greenbytes.de>.
> Am 02.03.2016 um 17:05 schrieb Yann Ylavic <yl...@gmail.com>:
> 
> On Wed, Mar 2, 2016 at 10:51 AM,  <ic...@apache.org> wrote:
>> Author: icing
>> Date: Wed Mar  2 09:51:05 2016
>> New Revision: 1733239
>> 
>> URL: http://svn.apache.org/viewvc?rev=1733239&view=rev
>> Log:
>> adding default port numbers for h2/h2x proxy schemes, by jchampion
>> 
>> Modified:
>>    httpd/httpd/trunk/modules/proxy/proxy_util.c
>> 
>> Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1733239&r1=1733238&r2=1733239&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
>> +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Mar  2 09:51:05 2016
>> @@ -3681,6 +3681,8 @@ static proxy_schemes_t pschemes[] =
>>     {"fcgi",     8000},
>>     {"ajp",      AJP13_DEF_PORT},
>>     {"scgi",     SCGI_DEF_PORT},
>> +    {"h2c",      DEFAULT_HTTP_PORT},
>> +    {"h2",       DEFAULT_HTTPS_PORT},
> 
> We possibly need another way to define/lookup/compare proxy schemes
> (likewise with APR's), the more this list grows, the more it is cycle
> consuming (jfclere reported an issue possibly related to it some time
> ago).
> 
> Maybe a load-time-constructed hash table ?

Hmmm, the things above are not all real URI schemes and, as such, have no real definition outside our project. I *would* like each canon_handler to return the port number or something like it. The knowledge about default ports would better reside in the mod_proxy_XXX source than the common util.

-Stefan

Re: svn commit: r1733239 - /httpd/httpd/trunk/modules/proxy/proxy_util.c

Posted by Yann Ylavic <yl...@gmail.com>.
On Wed, Mar 2, 2016 at 10:51 AM,  <ic...@apache.org> wrote:
> Author: icing
> Date: Wed Mar  2 09:51:05 2016
> New Revision: 1733239
>
> URL: http://svn.apache.org/viewvc?rev=1733239&view=rev
> Log:
> adding default port numbers for h2/h2x proxy schemes, by jchampion
>
> Modified:
>     httpd/httpd/trunk/modules/proxy/proxy_util.c
>
> Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1733239&r1=1733238&r2=1733239&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
> +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Mar  2 09:51:05 2016
> @@ -3681,6 +3681,8 @@ static proxy_schemes_t pschemes[] =
>      {"fcgi",     8000},
>      {"ajp",      AJP13_DEF_PORT},
>      {"scgi",     SCGI_DEF_PORT},
> +    {"h2c",      DEFAULT_HTTP_PORT},
> +    {"h2",       DEFAULT_HTTPS_PORT},

We possibly need another way to define/lookup/compare proxy schemes
(likewise with APR's), the more this list grows, the more it is cycle
consuming (jfclere reported an issue possibly related to it some time
ago).

Maybe a load-time-constructed hash table ?

>      { NULL, 0xFFFF }     /* unknown port */
>  };