You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2006/04/30 08:09:23 UTC
svn commit: r398282 - /httpd/httpd/branches/2.0.x/Makefile.win
Author: wrowe
Date: Sat Apr 29 23:09:21 2006
New Revision: 398282
URL: http://svn.apache.org/viewcvs?rev=398282&view=rev
Log:
Tweak the common issues in ssl.conf on Win32, SSLMutex (must be default)
and the SSL port.
Modified:
httpd/httpd/branches/2.0.x/Makefile.win
Modified: httpd/httpd/branches/2.0.x/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/Makefile.win?rev=398282&r1=398281&r2=398282&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/Makefile.win (original)
+++ httpd/httpd/branches/2.0.x/Makefile.win Sat Apr 29 23:09:21 2006
@@ -15,6 +15,7 @@
# Option Default
# INSTDIR \Apache2
# PORT 80
+# SSLPORT 443
# SERVERNAME localhost
#
# For example;
@@ -112,12 +113,18 @@
!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 @@
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" );