Commit 46b2b7b6 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r1834012, r1834013 from trunk: 

Add default schema ports for websockets

Nore userland/PR change

PR: 62480
Submitted by: Lubos Uhliarik <luhliari redhat.com>
Reviewed by: jim, rpluem, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834422 13f79535-47bb-0310-9956-ffa450edef68
parent e0d1fc4b

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.34



  *) mod_proxy_wstunnel: Add default schema ports for 'ws' and 'wss'.

     PR 62480. [Lubos Uhliarik <luhliari redhat.com>}

  

  *) logging: Some early logging-related startup messages could be lost

     when using syslog for the global ErrorLog. [Eric Covener]

modules/proxy/proxy_util.c

+2 −0
Original line number Diff line number Diff line
@@ -3862,6 +3862,8 @@ static proxy_schemes_t pschemes[] = 
    {"scgi",     SCGI_DEF_PORT},

    {"h2c",      DEFAULT_HTTP_PORT},

    {"h2",       DEFAULT_HTTPS_PORT},

    {"ws",       DEFAULT_HTTP_PORT},

    {"wss",      DEFAULT_HTTPS_PORT},

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

};