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/trunk@727477 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 66572b5787a51de9eed54f4e3a4445021edf6cb9..533880f4cae6fb4b8a62fb5d060e41e0167f1f08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.1
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) 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>]
+
   *) Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.
      PR 42571 and PR 44266 (dup).  [Dan Poirier <poirier pobox.com>]
 

diff --git a/server/listen.c b/server/listen.c
index eff2751075a6227225444f68892d5fee863645af..8ec09dc026098e8a7a44298d525fba5d461818b9 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -632,7 +632,11 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
     }
 
     if (argc != 2) {
-        proto = "http";
+        if (port == 443) {
+            proto = "https";
+        } else {
+            proto = "http";
+        }
     }
     else {
         proto = apr_pstrdup(cmd->pool, argv[1]);