From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 30 Apr 2006 06:09:21 +0000 (+0000)
Subject:   Tweak the common issues in ssl.conf on Win32, SSLMutex (must be default)
X-Git-Tag: 2.0.59~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93926f5679995579f38a1eec7816ae3c07745dd1;p=thirdparty%2Fapache%2Fhttpd.git

  Tweak the common issues in ssl.conf on Win32, SSLMutex (must be default)
  and the SSL port.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@398282 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.win b/Makefile.win
index c7ee29566cb..7645a792c39 100644
--- 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
@@ -645,7 +652,9 @@ BEGIN {
 	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
     }
     {
+	gsub( /443/, "$(PORT)" );
 	gsub( /@@ServerRoot@@/, serverroot );
+	gsub( /SSLMutex  file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default" );
 	gsub( /@exp_runtimedir@/, "logs" );
 	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
 	gsub( /@exp_logfiledir@/, "logs" );