You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2007/06/28 03:35:21 UTC
svn commit: r551424 - in /httpd/httpd/trunk: NWGNUmakefile
build/NWGNUenvironment.inc build/mkconfNW.awk
Author: fuankg
Date: Wed Jun 27 18:35:20 2007
New Revision: 551424
URL: http://svn.apache.org/viewvc?view=rev&rev=551424
Log:
enabled ports settable for NetWare install.
Modified:
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/build/NWGNUenvironment.inc
httpd/httpd/trunk/build/mkconfNW.awk
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?view=diff&rev=551424&r1=551423&r2=551424
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Wed Jun 27 18:35:20 2007
@@ -337,11 +337,7 @@
-copy CHANGES $(INSTALL)\$(BASEDIR)\*.*
-copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl
-copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl
-ifdef USE_STDSOCKETS
- -$(AWK) -v BDIR=$(BASEDIR) -v MODSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
-else
- -$(AWK) -v BDIR=$(BASEDIR) -v NWSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
-endif
+ -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
$(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul mkdir $(INSTALL)\$(BASEDIR)\conf\extra
-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-autoindex.conf
-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-dav.conf
@@ -351,9 +347,9 @@
-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-manual.conf
-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-mpm.conf
-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-multilang-errordoc.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf
-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-userdir.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf
+ -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf
+ -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf
-copy docs\conf\magic $(INSTALL)\$(BASEDIR)\conf\magic
-copy docs\conf\mime.types $(INSTALL)\$(BASEDIR)\conf\mime.types
-copy docs\conf\charset.conv $(INSTALL)\$(BASEDIR)\conf\charset.conv
Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?view=diff&rev=551424&r1=551423&r2=551424
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Wed Jun 27 18:35:20 2007
@@ -218,6 +218,14 @@
BASEDIR = Apache2
endif
+ifndef PORT
+PORT = 80
+endif
+
+ifndef SSLPORT
+SSLPORT = 443
+endif
+
# Add support for building IPV6 alongside
ifneq "$(IPV6)" ""
DEFINES += -DNW_BUILD_IPV6
Modified: httpd/httpd/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/mkconfNW.awk?view=diff&rev=551424&r1=551423&r2=551424
==============================================================================
--- httpd/httpd/trunk/build/mkconfNW.awk (original)
+++ httpd/httpd/trunk/build/mkconfNW.awk Wed Jun 27 18:35:20 2007
@@ -16,7 +16,8 @@
BEGIN {
A["ServerRoot"] = "SYS:/"BDIR
- A["Port"] = "80"
+ A["Port"] = PORT
+ A["SSLPort"] = SSLPORT
A["cgidir"] = "cgi-bin"
A["logfiledir"] = "logs"
A["htdocsdir"] = "htdocs"
@@ -93,6 +94,10 @@
next
}
+match ($0,/443/) {
+ sub(/443/, SSLPORT)
+}
+
match ($0,/^#SSLSessionCache +"dbm:/) {
sub(/^#/, "")
}
@@ -131,7 +136,7 @@
END {
- if (NWSSL) {
+ if (!BSDSKT) {
print ""
print "#"
print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "
@@ -140,7 +145,7 @@
print "# Change this to SecureListen on specific IP addresses as shown below to "
print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)"
print "#"
- print "#SecureListen 443 \"SSL CertificateDNS\""
+ print "#SecureListen "SSLPORT" \"SSL CertificateDNS\""
print ""
}
}