httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r398284 - /httpd/httpd/trunk/Makefile.win
Date Sun, 30 Apr 2006 06:21:43 GMT
Author: wrowe
Date: Sat Apr 29 23:21:41 2006
New Revision: 398284

URL: http://svn.apache.org/viewcvs?rev=398284&view=rev
Log:

  Fix two common overrides required for Win32

Modified:
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?rev=398284&r1=398283&r2=398284&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Sat Apr 29 23:21:41 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
@@ -741,6 +748,8 @@
     }
     {
 	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" );



Mime
View raw message