Fix two common overrides required for Win32

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

diff --git a/Makefile.win b/Makefile.win
index d12741a0b5d4745dc80712e3e27b1f7e25ccb82b..428e9d38c8b7debfaa62e6607623a979d740a160 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -15,6 +15,7 @@
 #   Option      Default
 #   INSTDIR     \Apache2
 #   PORT        80
+#   SSLPORT     443
 #   SERVERNAME  localhost
 #
 # For example;
@@ -112,12 +113,18 @@ SERVERNAME=localhost
 !IF "$(PORT)" == ""
 PORT=80
 !ENDIF 
+!IF "$(SSLPORT)" == ""
+SSLPORT=443
+!ENDIF 
 
 !IF "$(LONG)" == ""
 !MESSAGE
 !MESSAGE INSTDIR    = $(INSTDIR)
 !MESSAGE SERVERNAME = $(SERVERNAME)
 !MESSAGE PORT       = $(PORT)
+!IF EXIST("srclib\openssl")
+!MESSAGE SSLPORT    = $(SSLPORT)
+!ENDIF
 !MESSAGE
 !MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'
 !MESSAGE Example: nmake -f Makefile.win PORT=8080
@@ -741,6 +748,8 @@ BEGIN {
     }
     {
        gsub( /@@ServerRoot@@/, serverroot );
+       gsub( /443/, "$(SSLPORT)" );
+       gsub( /SSLMutex  file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default" );
        gsub( /@exp_runtimedir@/, "logs" );
        gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
        gsub( /@exp_logfiledir@/, "logs" );