Author: fuankg
Date: Mon Feb 4 15:00:07 2008
New Revision: 618483
URL: http://svn.apache.org/viewvc?rev=618483&view=rev
Log:
applied accepted backport of r606316, r606806: make https port configurable.
Modified:
httpd/httpd/branches/2.2.x/Makefile.in
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/acinclude.m4
httpd/httpd/branches/2.2.x/build/config_vars.sh.in
httpd/httpd/branches/2.2.x/build/mkconfNW.awk
httpd/httpd/branches/2.2.x/configure.in
httpd/httpd/branches/2.2.x/docs/conf/extra/httpd-ssl.conf.in
Modified: httpd/httpd/branches/2.2.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.in?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.in (original)
+++ httpd/httpd/branches/2.2.x/Makefile.in Mon Feb 4 15:00:07 2008
@@ -47,12 +47,14 @@
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 @@
-e '/@@LoadModule@@/d' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
< $$i; \
fi \
) > $(DESTDIR)$(sysconfdir)/original/$$i; \
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Feb 4 15:00:07 2008
@@ -81,16 +81,6 @@
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 ]
Modified: httpd/httpd/branches/2.2.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/acinclude.m4?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.2.x/acinclude.m4 Mon Feb 4 15:00:07 2008
@@ -79,6 +79,7 @@
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)
Modified: httpd/httpd/branches/2.2.x/build/config_vars.sh.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/config_vars.sh.in?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/config_vars.sh.in (original)
+++ httpd/httpd/branches/2.2.x/build/config_vars.sh.in Mon Feb 4 15:00:07 2008
@@ -49,6 +49,7 @@
/^DSO_MODULES/d
/^MODULE_/d
/^PORT/d
+/^SSLPORT/d
/^nonssl_/d
/^CORE_IMPLIB/d
/^rel_/d
Modified: httpd/httpd/branches/2.2.x/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/mkconfNW.awk?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/mkconfNW.awk (original)
+++ httpd/httpd/branches/2.2.x/build/mkconfNW.awk Mon Feb 4 15:00:07 2008
@@ -93,10 +93,6 @@
next
}
-match ($0,/443/) {
- sub(/443/, SSLPORT)
-}
-
match ($0,/^#SSLSessionCache +"dbm:/) {
sub(/^#/, "")
}
Modified: httpd/httpd/branches/2.2.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/configure.in (original)
+++ httpd/httpd/branches/2.2.x/configure.in Mon Feb 4 15:00:07 2008
@@ -434,6 +434,10 @@
[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),
Modified: httpd/httpd/branches/2.2.x/docs/conf/extra/httpd-ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/conf/extra/httpd-ssl.conf.in?rev=618483&r1=618482&r2=618483&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/conf/extra/httpd-ssl.conf.in (original)
+++ httpd/httpd/branches/2.2.x/docs/conf/extra/httpd-ssl.conf.in Mon Feb 4 15:00:07 2008
@@ -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 @@
## 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"
|