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

diff --git a/CHANGES b/CHANGES
index d656b5818822dd2c3c708938d766be1ffbb588f8..5420876a48cb8e8645aabc9badd777b3a7aea6fd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- 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>]
 

diff --git a/STATUS b/STATUS
index c22597128d99aa8d44c62fff0163007e23089a3f..5d541fd3130c46f575ef622df00c40385c0ed622 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]
 

diff --git a/server/listen.c b/server/listen.c
index d1e6da8ebfdd0a83ffedbedd22a989d805ea69fa..b284d83b3c7cd137c79cba015174a227655821e3 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -633,7 +633,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]);