update after backport

[apache] / build / mkconfNW.awk

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 0956ce98c2cc437c68a5223d21a18abd67cf9478..465cccf602da85c356a84fd70de2f0b45c5cec8d 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 BEGIN {
-    
-    A["ServerRoot"] = "SYS:/"BDIR
-    A["Port"] = "80"
+    A["ServerRoot"] = "\${SRVROOT}"
+    A["Port"] = PORT
+    A["SSLPort"] = SSLPORT
     A["cgidir"] = "cgi-bin"
     A["logfiledir"] = "logs"
     A["htdocsdir"] = "htdocs"
@@ -26,44 +26,51 @@ BEGIN {
     A["runtimedir"] = "logs"
     A["errordir"] = "error"
     A["proxycachedir"] = "proxy"
+    A["davlockdb"] = "davlockdb"
 
     B["htdocsdir"] = A["ServerRoot"]"/"A["htdocsdir"]
     B["iconsdir"] = A["ServerRoot"]"/"A["iconsdir"]
     B["manualdir"] = A["ServerRoot"]"/"A["manualdir"]
     B["errordir"] = A["ServerRoot"]"/"A["errordir"]
     B["proxycachedir"] = A["ServerRoot"]"/"A["proxycachedir"]
+    B["davlockdb"] = A["ServerRoot"]"/"A["davlockdb"]
     B["cgidir"] = A["ServerRoot"]"/"A["cgidir"]
     B["logfiledir"] = A["logfiledir"]
     B["sysconfdir"] = A["sysconfdir"]
-    B["listen_stmt_1"] = "Listen "A["Port"]
-    B["listen_stmt_2"] = ""
+    B["runtimedir"] = A["runtimedir"]
 }
 
+/^ServerRoot / {
+    print "Define SRVROOT \"SYS:/" BDIR "\""
+    print ""
+}
 /@@LoadModule@@/ {
     print "#LoadModule access_compat_module modules/accesscompat.nlm"
     print "#LoadModule actions_module modules/actions.nlm"
+    print "#LoadModule allowmethods_module modules/allowmethods.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"
     print "#LoadModule ldap_module modules/utilldap.nlm"
     print "#LoadModule asis_module modules/mod_asis.nlm"
     print "LoadModule autoindex_module modules/autoindex.nlm"
+    print "#LoadModule buffer_module modules/modbuffer.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 data_module modules/mod_data.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"
     print "#LoadModule expires_module modules/expires.nlm"
+    print "#LoadModule filter_module modules/mod_filter.nlm"
     print "#LoadModule ext_filter_module modules/extfiltr.nlm"
     print "#LoadModule file_cache_module modules/filecach.nlm"
     print "#LoadModule headers_module modules/headers.nlm"
@@ -85,12 +92,29 @@ 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 socache_dbm_module modules/socachedbm.nlm"
+       print "#LoadModule socache_shmcb_module modules/socacheshmcb.nlm"
+       print "#LoadModule ssl_module modules/mod_ssl.nlm"
+    }
+    if (MODHTTP2) {
+       print "#LoadModule http2_module modules/mod_http2.nlm"
+       print "#LoadModule proxy_http2_module modules/proxyhttp2.nlm"
+    }
     print ""
     next
 }
 
-match ($0,/SSLMutex  file:@exp_runtimedir@\/ssl_mutex/) {
-    sub(/SSLMutex  file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default")
+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,/@@.*@@/) {
@@ -113,21 +137,31 @@ 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) {
+    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."
+       print "# and/or ports (mod_nwssl)."
        print "#"
        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 ""
 }