summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorPaul J. Reder <rederpj@apache.org>2008-12-17 20:20:50 +0100
committerPaul J. Reder <rederpj@apache.org>2008-12-17 20:20:50 +0100
commit48d1213d62160c59d4a7317f4e966b2056cac277 (patch)
treeccff769a5b5135e45df7a6b3b0baab367c44025f /server
parentOutput -M and -S dumps (modules and vhosts) to stdout instead of stderr. (diff)
downloadapache2-48d1213d62160c59d4a7317f4e966b2056cac277.tar.xz
apache2-48d1213d62160c59d4a7317f4e966b2056cac277.zip
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
Diffstat (limited to 'server')
-rw-r--r--server/listen.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/server/listen.c b/server/listen.c
index eff2751075..8ec09dc026 100644
--- 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]);