Enabled to configure the https port as we do with http port too.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606316 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index e68c381506bb42e0391b1f624584df44b99cca29..3f09eebfdd03889c766ea3e97f5cb246b316529d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,12 +47,14 @@ install-conf:
                        if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
                                sed -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e '/@@LoadModule@@/d' \
                                        < $$i; \
                        else \
                                sed -n -e '/@@LoadModule@@/q' \
                                        -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e 'p' \
                                        < $$i; \
                                for j in $(DSO_MODULES) "^EOL^"; do \
@@ -64,6 +66,7 @@ install-conf:
                                        -e '/@@LoadModule@@/d' \
                                        -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        < $$i; \
                        fi \
                ) > $(DESTDIR)$(sysconfdir)/original/$$i; \

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 39e60e0b66013f1c053f698fe418a13ff9088834..7d63b516605bcbffc58bcc419ee6c8dc441e3fde 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -94,10 +94,6 @@ BEGIN {
     next
 }
 
-match ($0,/443/) {
-    sub(/443/, SSLPORT)
-}
-
 match ($0,/^#SSLSessionCache +"dbm:/) {
     sub(/^#/, "")
 }

diff --git a/configure.in b/configure.in
index f3a55b2d15df45ddc79f395a5565d543c3f63263..65bad7c0244532b0ca60a4112c6902f626074d09 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -443,6 +443,10 @@ AC_ARG_WITH(port,APACHE_HELP_STRING(--with-port=PORT,Port on which to listen (de
         [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-port requires a value (the TCP port number)'); else PORT="$withval"; fi],
        [PORT=80])
 
+AC_ARG_WITH(sslport,APACHE_HELP_STRING(--with-sslport=SSLPORT,Port on which to securelisten (default is 443)),
+        [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-sslport requires a value (the SSL TCP port number)'); else SSLPORT="$withval"; fi],
+       [SSLPORT=443])
+
 APR_CHECK_APR_DEFINE(APR_HAVE_IPV6)
 
 AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets to handle IPv4 connections),

diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index 2dc193e8c13fd4f58d3fb107c923ba6b3f180e12..6170d498ddc6c4360b1155d1913eb54741072b1d 100644 (file)
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -34,7 +34,7 @@
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
 #       Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
 #
-Listen 443
+Listen @@SSLPort@@
 
 ##
 ##  SSL Global Context
@@ -65,11 +65,11 @@ SSLMutex  "file:@exp_runtimedir@/ssl_mutex"
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost _default_:443>
+<VirtualHost _default_:@@SSLPort@@>
 
 #   General setup for the virtual host
 DocumentRoot "@exp_htdocsdir@"
-ServerName www.example.com:443
+ServerName www.example.com:@@SSLPort@@
 ServerAdmin you@example.com
 ErrorLog "@exp_logfiledir@/error_log"
 TransferLog "@exp_logfiledir@/access_log"