applied accepted backport of r606316, r606806: make https port configurable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@618483 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/STATUS b/STATUS
index 9cf584a5a092dddaea8e380e5d90afca8311898b..52cc4769ed75798c576e6945aa4719da5361d4b4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -81,16 +81,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * configure / install: Make https port configurable.
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=606316&view=rev
-         http://svn.apache.org/viewvc?rev=606806&view=rev
-      Backport version for 2.2.x of patch:
-         http://people.apache.org/~fuankg/diffs/sslport.diff
-      +1: fuankg, wrowe, mturk
-      wrowe notes; Win32 is already ready for this, and there's no rush
-      to push this into the immediate next-release.
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/acinclude.m4 b/acinclude.m4
index 742711fa8d40572e000e7e20027fd751da989fa7..a6fba9b480b74e45aad5d235ea8d7d4bc35708e0 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(MODULE_CLEANDIRS)
   APACHE_SUBST(PORT)
+  APACHE_SUBST(SSLPORT)
   APACHE_SUBST(nonssl_listen_stmt_1)
   APACHE_SUBST(nonssl_listen_stmt_2)
   APACHE_SUBST(CORE_IMPLIB_FILE)

diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 0b0fb1b04297f2b9fc9e9179cfdbd3a5fc54dcc3..81bbd709692047fd7d7fdb661b581fe50ef49a40 100644 (file)
--- a/build/config_vars.sh.in
+++ b/build/config_vars.sh.in
@@ -49,6 +49,7 @@ exec sed "
 /^DSO_MODULES/d
 /^MODULE_/d
 /^PORT/d
+/^SSLPORT/d
 /^nonssl_/d
 /^CORE_IMPLIB/d
 /^rel_/d

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 20f3bb466a5631dbbd8c8a921d3bfe1fbf6767ef..623a739540b57ba42a3acd9926ffde06921674d1 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -93,10 +93,6 @@ BEGIN {
     next
 }
 
-match ($0,/443/) {
-    sub(/443/, SSLPORT)
-}
-
 match ($0,/^#SSLSessionCache +"dbm:/) {
     sub(/^#/, "")
 }

diff --git a/configure.in b/configure.in
index 5ab7133c22ec690a5a532f176d0402b0e62d8054..836958a2a7cec706467cf7f99247c2996d76774a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -434,6 +434,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 1527ff20c6c65b550e55af548ddaca88528a28bf..b9f12834d7787f1bcc3c2dd758a1ea2d4ff6a9ed 100644 (file)
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -32,9 +32,9 @@
 # standard HTTP port (see above) and to the HTTPS port
 #
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-#       Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
+#       Listen directives: "Listen [::]:@@SSLPort@@" and "Listen 0.0.0.0:@@SSLPort@@"
 #
-Listen 443
+Listen @@SSLPort@@
 
 ##
 ##  SSL Global Context
@@ -71,11 +71,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"