httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r552797 - in /httpd/httpd/branches/2.2.x: NWGNUmakefile build/NWGNUenvironment.inc build/mkconfNW.awk
Date Tue, 03 Jul 2007 11:57:53 GMT
Author: fuankg
Date: Tue Jul  3 04:57:52 2007
New Revision: 552797

URL: http://svn.apache.org/viewvc?view=rev&rev=552797
Log:
moved socket vars to inc file; added var for awk;
made ports settable; fixed httpd-ssl.conf generation;
removed xcopy batch; tidy-up (removed unneeded spaces).

Modified:
    httpd/httpd/branches/2.2.x/NWGNUmakefile
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.2.x/build/mkconfNW.awk

Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?view=diff&rev=552797&r1=552796&r2=552797
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Tue Jul  3 04:57:52 2007
@@ -7,7 +7,7 @@
 	build \
 	support \
 	modules \
-	$(EOLIST) 
+	$(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -77,7 +77,7 @@
 			$(EOLIST)
 
 XLFLAGS		+= \
-		   	$(EOLIST)
+			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -91,7 +91,7 @@
 			$(EOLIST)
 
 XLFLAGS		+= \
-		   	$(EOLIST)
+			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -113,17 +113,12 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		= Apache2
+NLM_NAME	= Apache2
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
-ifdef USE_STDSOCKETS
-VERSION_SKT = (BSDSOCK)
-else
-VERSION_SKT = (WINSOCK)
-endif
 NLM_DESCRIPTION	= Apache Web Server $(VERSION_STR) $(VERSION_SKT)
 
 #
@@ -140,16 +135,16 @@
 
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION		=
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE	= 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -169,14 +164,14 @@
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		=  PSEUDOPREEMPTION
+NLM_FLAGS	= PSEUDOPREEMPTION
 
 #
-# If this is specified it will be linked in with the XDCData option in the def 
+# If this is specified it will be linked in with the XDCData option in the def
 # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
 # by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA		=
 
 #
 # If there is an NLM target, put it here
@@ -249,7 +244,7 @@
 # Build in mod_nw_ssl if Winsock is being used
 ifndef USE_STDSOCKETS
 FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.o \
-	       $(EOLIST)
+	$(EOLIST)
 endif
 
 #
@@ -257,7 +252,7 @@
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-   	libcpre.o \
+	libcpre.o \
 	$(EOLIST)
 
 #
@@ -273,7 +268,7 @@
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -297,22 +292,22 @@
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-	       $(EOLIST)
+	$(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
 	@$(NWOS)/httpd.imp \
 	$(EOLIST)
-	
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-		$(EOLIST)
+	$(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -323,7 +318,7 @@
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -335,38 +330,29 @@
 	-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) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
-else
-	-awk -v BDIR=$(BASEDIR) -v SSL=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
-	-awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-default.conf
-	-awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-info.conf
-	-awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-languages.conf
-	-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) -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
+	-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-default.conf
+	-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-info.conf
+	-$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in
>$(INSTALL)\$(BASEDIR)\conf\extra\httpd-languages.conf
+	-$(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-userdir.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-userdir.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
 	-copy docs\cgi-examples\printenv $(INSTALL)\$(BASEDIR)\cgi-bin\printenv.pl
-	@echo rem copying the docs directories > xc.bat
-	@echo xcopy docs\error $(INSTALL)\$(BASEDIR)\error $(XCOPYSW) >> xc.bat
-	@echo xcopy docs\docroot $(INSTALL)\$(BASEDIR)\htdocs $(XCOPYSW) >> xc.bat
-	@echo xcopy docs\icons $(INSTALL)\$(BASEDIR)\icons $(XCOPYSW) >> xc.bat
-	@echo xcopy docs\man $(INSTALL)\$(BASEDIR)\man $(XCOPYSW) >> xc.bat
-	@echo xcopy docs\manual $(INSTALL)\$(BASEDIR)\manual $(XCOPYSW) >> xc.bat
-	$(CMD) xc.bat
-	$(DEL) xc.bat
+	@xcopy $(XCOPYSW) docs\error $(INSTALL)\$(BASEDIR)\error
+	@xcopy $(XCOPYSW) docs\docroot $(INSTALL)\$(BASEDIR)\htdocs
+	@xcopy $(XCOPYSW) docs\icons $(INSTALL)\$(BASEDIR)\icons
+	@xcopy $(XCOPYSW) docs\man $(INSTALL)\$(BASEDIR)\man
+	@xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual
 
-
-    
 installdev :: FORCE
 	-copy $(subst /,\,$(AP_WORK))\include\*.h           $(INSTALL)\$(BASEDIR)\include\*.*
 	-copy $(subst /,\,$(AP_WORK))\os\netware\*.h        $(INSTALL)\$(BASEDIR)\include\*.*
@@ -375,7 +361,7 @@
 	-copy $(subst /,\,$(APRUTIL))\include\*.h           $(INSTALL)\$(BASEDIR)\include\*.*
 	-copy $(subst /,\,$(APR))\*.imp                     $(INSTALL)\$(BASEDIR)\lib\*.*
 	-copy $(subst /,\,$(NWOS))\*.xdc                    $(INSTALL)\$(BASEDIR)\lib\*.*
-    
+
 prebuild :: FORCE
 	$(MAKE) -C server -f NWGNUMakefile
 	$(MAKE) -C srclib/pcre -f NWGNUMakefile
@@ -383,7 +369,6 @@
 	-copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
 	-copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
 
-
 #
 # Any specialized rules here
 #
@@ -398,4 +383,5 @@
 #
 
 include $(AP_WORK)\build\NWGNUtail.inc
+
 

Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?view=diff&rev=552797&r1=552796&r2=552797
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Tue Jul  3 04:57:52 2007
@@ -111,10 +111,13 @@
 #
 
 # MetroWerks NLM tools
-CC		= mwccnlm
-CPP		= mwccnlm
+CC	= mwccnlm
+CPP	= mwccnlm
 LINK	= mwldnlm
-LIB		= mwldnlm -type library -w nocmdline
+LIB	= mwldnlm -type library -w nocmdline
+
+# Setup build tools
+AWK	= awk
 
 ifdef IPV6
 ifndef USE_STDSOCKETS
@@ -132,12 +135,18 @@
 INCDIRS := $(INCDIRS);$(ZLIBSDK)
 endif
 
-DEFINES		= -DNETWARE 
+DEFINES	= -DNETWARE 
 ifndef USE_STDSOCKETS
-DEFINES += -DUSE_WINSOCK
+DEFINES	+= -DUSE_WINSOCK
 endif
 ifndef DEBUG
-DEFINES += -DNDEBUG
+DEFINES	+= -DNDEBUG
+endif
+
+ifdef USE_STDSOCKETS
+VERSION_SKT = (BSDSOCK)
+else
+VERSION_SKT = (WINSOCK)
 endif
 
 #
@@ -209,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
@@ -229,7 +246,7 @@
 endif
 
 INSTDEVDIRS := \
-    $(INSTDIRS) \
+	$(INSTDIRS) \
 	$(INSTALL)\$(BASEDIR)\include \
 	$(INSTALL)\$(BASEDIR)\lib \
 
@@ -256,21 +273,20 @@
 endif
 
 ifeq "$(OS)" "Windows_NT"
-CMD=cmd /C
-CHK=cmd /C if exist
-CHKNOT=cmd /C if not exist
+CMD = cmd /C
 DEL = del /F
-DELTREE = cmd /C rd /s/q
-WINNT=1
+DELTREE = rd /s/q
+WINNT = 1
 XCOPYSW = /E
 else
-CMD=command /C
-CHK=command /C if exist
-CHKNOT=command /C if not exist
+CMD = command /C
 DEL = del
 DELTREE = deltree /y
 XCOPYSW = /E /Y
 endif
+
+CHK = $(CMD) if exist
+CHKNOT = $(CMD) if not exist
 
 
 #

Modified: httpd/httpd/branches/2.2.x/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/mkconfNW.awk?view=diff&rev=552797&r1=552796&r2=552797
==============================================================================
--- httpd/httpd/branches/2.2.x/build/mkconfNW.awk (original)
+++ httpd/httpd/branches/2.2.x/build/mkconfNW.awk Tue Jul  3 04:57:52 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"
@@ -35,6 +36,7 @@
     B["cgidir"] = A["ServerRoot"]"/"A["cgidir"]
     B["logfiledir"] = A["logfiledir"]
     B["sysconfdir"] = A["sysconfdir"]
+    B["runtimedir"] = A["runtimedir"]
     B["listen_stmt_1"] = "Listen "A["Port"]
     B["listen_stmt_2"] = ""
 }
@@ -44,13 +46,17 @@
     print "#LoadModule auth_basic_module modules/authbasc.nlm"
     print "#LoadModule auth_digest_module modules/authdigt.nlm"
     print "#LoadModule authn_anon_module modules/authnano.nlm"
+    print "#LoadModule authn_dbd_module modules/authndbd.nlm"
     print "#LoadModule authn_dbm_module modules/authndbm.nlm"
     print "#LoadModule authn_default_module modules/authndef.nlm"
     print "#LoadModule authn_file_module modules/authnfil.nlm"
+    print "#LoadModule authz_dbd_module modules/authzdbd.nlm"
     print "#LoadModule authz_dbm_module modules/authzdbm.nlm"
     print "#LoadModule authz_default_module modules/authzdef.nlm"
     print "#LoadModule authz_groupfile_module modules/authzgrp.nlm"
     print "#LoadModule authz_user_module modules/authzusr.nlm"
+    print "#LoadModule authnz_ldap_module modules/authnzldap.nlm"
+    print "#LoadModule ldap_module modules/utilldap.nlm"
     print "#LoadModule asis_module modules/mod_asis.nlm"
     print "LoadModule autoindex_module modules/autoindex.nlm"
     print "#LoadModule cern_meta_module modules/cernmeta.nlm"
@@ -80,12 +86,27 @@
     print "#LoadModule version_module modules/modversion.nlm"
     print "#LoadModule userdir_module modules/userdir.nlm"
     print "#LoadModule vhost_alias_module modules/vhost.nlm"
+    if (MODSSL) {
+       print "#LoadModule ssl_module modules/mod_ssl.nlm"
+    }
     print ""
     next
 }
 
-match ($0,/SSLMutex  file:@exp_runtimedir@\/ssl_mutex/) {
-    sub(/SSLMutex  file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default")
+match ($0,/443/) {
+    sub(/443/, SSLPORT)
+}
+
+match ($0,/^#SSLSessionCache +"dbm:/) {
+    sub(/^#/, "")
+}
+
+match ($0,/^SSLSessionCache +"shmcb:/) {
+    sub(/^SSLSessionCache/, "#SSLSessionCache")
+}
+
+match ($0,/^SSLMutex +"file:@exp_runtimedir@\/ssl_mutex"/) {
+    sub(/"file:@exp_runtimedir@\/ssl_mutex"/, "default")
 }
 
 match ($0,/@@.*@@/) {
@@ -114,7 +135,7 @@
 
 
 END {
-    if (SSL) {
+    if (!BSDSKT) {
        print ""
        print "#"
        print "# SecureListen: Allows you to securely bind Apache to specific IP addresses
"
@@ -123,6 +144,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 ""
     }
 }



Mime
View raw message