Commit b34ce8ef authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Merge r1851093 from trunk 

   * mod_proxy_wstunnel: Fix websocket proxy over UDS.

PR: 62932
Submitted by: <pavel dcmsys.com>
Reviewed by: jailletc36 (by inspection), jim, ylavic
Backported by: jailletc36

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

CHANGES

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

Changes with Apache 2.4.39



  *) mod_proxy_wstunnel: Fix websocket proxy over UDS.

     PR 62932 <pavel dcmsys.com>



  *) mod_ssl: Don't unset FIPS mode on restart unless it's forced by

     configuration (SSLFIPS on) and not active by default in OpenSSL.

     PR 63136. [Yann Ylavic]

modules/proxy/mod_proxy_wstunnel.c

+4 −1
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ static int proxy_wstunnel_canon(request_rec *r, char *url) 
    if (path == NULL)

        return HTTP_BAD_REQUEST;



    if (port != def_port)

        apr_snprintf(sport, sizeof(sport), ":%d", port);

    else

        sport[0] = '\0';



    if (ap_strchr_c(host, ':')) {

        /* if literal IPv6 address */