Commit 4a6313a0 authored by Paul J. Reder's avatar Paul J. Reder
Browse files

Commit promoted backport of PR 46066. 

  *) Set Listen protocol to "https" if port is set to 443 and no proto is specified
     (as documented but not implemented). PR 46066  [Dan Poirier <poirier pobox.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@727769 13f79535-47bb-0310-9956-ffa450edef68
parent 67a9eb7a

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.12



  *) Set Listen protocol to "https" if port is set to 443 and no proto is specified

     (as documented but not implemented). PR 46066  [Dan Poirier <poirier pobox.com>]



  *) mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401

     [Dan Poirier <poirier pobox.com>]

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -95,14 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
      http://people.apache.org/~rederpj/backport_PR45994_util_ldap.c.diff

   +1: rederpj, rpluem, covener



 * Set Listen protocol to "https" if port is set to 443 and no proto is specified

     (as documented but not implemented). PR 46066  [Dan Poirier <poirier pobox.com>]

   Trunk version of patch:

      http://svn.apache.org/viewvc?view=rev&revision=727477

   Backport version for 2.2.x of patch (trunk patch applies with offset):

      http://people.apache.org/~rederpj/backport_PR46066_443https.diff

   +1: rederpj, rpluem, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/listen.c

+4 −0
Changes for server/listen.c: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -633,8 +633,12 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, 
    }



    if (argc != 2) {

        if (port == 443) {

            proto = "https";

        } else {

            proto = "http";

        }

    }

    else {

        proto = apr_pstrdup(cmd->pool, argv[1]);

        ap_str_tolower(proto);