Introduce ap_(get|set)_core_module_config() functions/macros and use them

[apache] / build / mkconfNW.awk

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 88c5bfccfdefa2dcae9dd26d3c172f6aa8aad1f4..52858bffc25d548b9f8625d17a252f281594f498 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -1,9 +1,9 @@
-# Copyright 2002-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
@@ -15,8 +15,9 @@
 
 BEGIN {
     
-    A["ServerRoot"] = "SYS:/APACHE2"
-    A["Port"] = "80"
+    A["ServerRoot"] = "SYS:/"BDIR
+    A["Port"] = PORT
+    A["SSLPort"] = SSLPORT
     A["cgidir"] = "cgi-bin"
     A["logfiledir"] = "logs"
     A["htdocsdir"] = "htdocs"
@@ -33,22 +34,22 @@ BEGIN {
     B["errordir"] = A["ServerRoot"]"/"A["errordir"]
     B["proxycachedir"] = A["ServerRoot"]"/"A["proxycachedir"]
     B["cgidir"] = A["ServerRoot"]"/"A["cgidir"]
-    B["listen_stmt_1"] = "Listen "A["Port"]
-    B["listen_stmt_2"] = ""
+    B["logfiledir"] = A["logfiledir"]
+    B["sysconfdir"] = A["sysconfdir"]
+    B["runtimedir"] = A["runtimedir"]
 }
 
 /@@LoadModule@@/ {
+    print "#LoadModule access_compat_module modules/accesscompat.nlm"
     print "#LoadModule actions_module modules/actions.nlm"
     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"
@@ -56,7 +57,7 @@ BEGIN {
     print "#LoadModule asis_module modules/mod_asis.nlm"
     print "LoadModule autoindex_module modules/autoindex.nlm"
     print "#LoadModule cern_meta_module modules/cernmeta.nlm"
-    print "#LoadModule cgi_module modules/mod_cgi.nlm"
+    print "LoadModule cgi_module modules/mod_cgi.nlm"
     print "#LoadModule dav_module modules/mod_dav.nlm"
     print "#LoadModule dav_fs_module modules/moddavfs.nlm"
     print "#LoadModule dav_lock_module modules/moddavlk.nlm"
@@ -82,10 +83,25 @@ BEGIN {
     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,/^#SSLSessionCache +"dbm:/) {
+    sub(/^#/, "")
+}
+
+match ($0,/^SSLSessionCache +"shmcb:/) {
+    sub(/^SSLSessionCache/, "#SSLSessionCache")
+}
+
+match ($0,/^# Mutex +default +file:@rel_runtimedir@/) {
+    sub(/file:@rel_runtimedir@/, "default")
+}
+
 match ($0,/@@.*@@/) {
     s=substr($0,RSTART+2,RLENGTH-4)
     sub(/@@.*@@/,A[s],$0)
@@ -106,14 +122,23 @@ match ($0,/@nonssl_.*@/) {
     sub(/@nonssl_.*@/,B[s],$0)
 }
 
+match ($0,/^<IfModule cgid_module>$/) {
+    print "#"
+    print "# CGIMapExtension: Technique for locating the interpreter for CGI scripts."
+    print "# The special interpreter path \"OS\" can be used for NLM CGIs."
+    print "#"
+    print "#CGIMapExtension OS .cgi"
+    print "CGIMapExtension SYS:/perl/Perlcgi/perlcgi.nlm .pl"
+    print ""
+}
+
 {
     print
 }
 
-
 END {
-    if (SSL) {
-       print
+    if ((ARGV[1] ~ /httpd.conf.in/) && !BSDSKT) { 
+       print ""
        print "#"
        print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "
        print "# and/or ports."
@@ -121,6 +146,7 @@ END {
        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 ""
 }