httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rede...@apache.org
Subject svn commit: r727769 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS server/listen.c
Date Thu, 18 Dec 2008 17:22:55 GMT
Author: rederpj
Date: Thu Dec 18 09:22:54 2008
New Revision: 727769

URL: http://svn.apache.org/viewvc?rev=727769&view=rev
Log:
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>]

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/listen.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=727769&r1=727768&r2=727769&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Dec 18 09:22:54 2008
@@ -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>]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=727769&r1=727768&r2=727769&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Dec 18 09:22:54 2008
@@ -95,14 +95,6 @@
       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 ]
 

Modified: httpd/httpd/branches/2.2.x/server/listen.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/listen.c?rev=727769&r1=727768&r2=727769&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/listen.c (original)
+++ httpd/httpd/branches/2.2.x/server/listen.c Thu Dec 18 09:22:54 2008
@@ -633,7 +633,11 @@
     }
 
     if (argc != 2) {
-        proto = "http";
+        if (port == 443) {
+            proto = "https";
+        } else {
+            proto = "http";
+        }
     }
     else {
         proto = apr_pstrdup(cmd->pool, argv[1]);



Mime
View raw message