Merge the AP_OPENSSL_USE_ERRNO_THREADID check to trunk for wider testing

[apache] / build / installwinconf.awk

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index 8ad1e58d8ca0a125abc2ead7f2f2c5cc80cd2c84..e3ed08423d9598c08b569b0ea8a0504ccc6a8b86 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -47,12 +47,12 @@ BEGIN {
     }
 
     print "Installing Apache HTTP Server 2.x with" >tstfl;
-    print " DomainName =    " domainname >tstfl;
-    print " ServerName =    " servername >tstfl;
-    print " ServerAdmin =   " serveradmin >tstfl;
-    print " ServerPort =    " serverport >tstfl;
+    print " DomainName    = " domainname >tstfl;
+    print " ServerName    = " servername >tstfl;
+    print " ServerAdmin   = " serveradmin >tstfl;
+    print " ServerPort    = " serverport >tstfl;
     print " ServerSslPort = " serversslport >tstfl;
-    print " ServerRoot =    " serverroot >tstfl;
+    print " ServerRoot    = " serverroot >tstfl;
 
     filelist["httpd.conf"] = "httpd.conf.in";
     filelist["httpd-autoindex.conf"] = "httpd-autoindex.conf.in";
@@ -60,6 +60,7 @@ BEGIN {
     filelist["httpd-default.conf"] = "httpd-default.conf.in";
     filelist["httpd-info.conf"] = "httpd-info.conf.in";
     filelist["httpd-languages.conf"] = "httpd-languages.conf.in";
+    filelist["httpd-macro.conf"] = "httpd-macro.conf.in";
     filelist["httpd-manual.conf"] = "httpd-manual.conf.in";
     filelist["httpd-mpm.conf"] = "httpd-mpm.conf.in";
     filelist["httpd-multilang-errordoc.conf"] = "httpd-multilang-errordoc.conf.in";
@@ -96,16 +97,19 @@ BEGIN {
           print "LoadModule access_compat_module modules/mod_access_compat.so" > dstfl;
           print "LoadModule actions_module modules/mod_actions.so" > dstfl;
           print "LoadModule alias_module modules/mod_alias.so" > dstfl;
-          print "LoadModule allowmethods_module modules/mod_allowmethods.so" > dstfl;
+          print "#LoadModule allowhandlers_module modules/mod_allowhandlers.so" > dstfl;
+          print "#LoadModule allowmethods_module modules/mod_allowmethods.so" > dstfl;
           print "LoadModule asis_module modules/mod_asis.so" > dstfl;
           print "LoadModule auth_basic_module modules/mod_auth_basic.so" > dstfl;
           print "#LoadModule auth_digest_module modules/mod_auth_digest.so" > dstfl;
+          print "#LoadModule auth_form_module modules/mod_auth_form.so" > dstfl;
           print "#LoadModule authn_anon_module modules/mod_authn_anon.so" > dstfl;
           print "LoadModule authn_core_module modules/mod_authn_core.so" > dstfl;
           print "#LoadModule authn_dbd_module modules/mod_authn_dbd.so" > dstfl;
           print "#LoadModule authn_dbm_module modules/mod_authn_dbm.so" > dstfl;
           print "LoadModule authn_file_module modules/mod_authn_file.so" > dstfl;
           print "#LoadModule authn_socache_module modules/mod_authn_socache.so" > dstfl;
+          print "#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so" > dstfl;
           print "#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so" > dstfl;
           print "LoadModule authz_core_module modules/mod_authz_core.so" > dstfl;
           print "#LoadModule authz_dbd_module modules/mod_authz_dbd.so" > dstfl;
@@ -118,6 +122,7 @@ BEGIN {
           print "#LoadModule buffer_module modules/mod_buffer.so" > dstfl;
           print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
           print "#LoadModule cache_disk_module modules/mod_cache_disk.so" > dstfl;
+          print "#LoadModule cache_socache_module modules/mod_cache_socache.so" > dstfl;
           print "#LoadModule cern_meta_module modules/mod_cern_meta.so" > dstfl;
           print "LoadModule cgi_module modules/mod_cgi.so" > dstfl;
           print "#LoadModule charset_lite_module modules/mod_charset_lite.so" > dstfl;
@@ -134,6 +139,7 @@ BEGIN {
           print "#LoadModule ext_filter_module modules/mod_ext_filter.so" > dstfl;
           print "#LoadModule file_cache_module modules/mod_file_cache.so" > dstfl;
           print "#LoadModule filter_module modules/mod_filter.so" > dstfl;
+          print "#LoadModule http2_module modules/mod_http2.so" > dstfl;
           print "#LoadModule headers_module modules/mod_headers.so" > dstfl;
           print "#LoadModule heartbeat_module modules/mod_heartbeat.so" > dstfl;
           print "#LoadModule heartmonitor_module modules/mod_heartmonitor.so" > dstfl;
@@ -152,6 +158,7 @@ BEGIN {
           print "#LoadModule log_debug_module modules/mod_log_debug.so" > dstfl;
           print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl;
           print "#LoadModule lua_module modules/mod_lua.so" > dstfl;
+          print "#LoadModule macro_module modules/mod_macro.so" > dstfl;
           print "LoadModule mime_module modules/mod_mime.so" > dstfl;
           print "#LoadModule mime_magic_module modules/mod_mime_magic.so" > dstfl;
           print "LoadModule negotiation_module modules/mod_negotiation.so" > dstfl;
@@ -162,9 +169,12 @@ BEGIN {
           print "#LoadModule proxy_express_module modules/mod_proxy_express.so" > dstfl;
           print "#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so" > dstfl;
           print "#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so" > dstfl;
+          print "#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so" > dstfl;
           print "#LoadModule proxy_html_module modules/mod_proxy_html.so" > dstfl;
           print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl;
           print "#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so" > dstfl;
+          print "#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so" > dstfl;
+          print "#LoadModule proxy_http2_module modules/mod_proxy_http2.so" > dstfl;
           print "#LoadModule ratelimit_module modules/mod_ratelimit.so" > dstfl;
           print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl;
           print "#LoadModule remoteip_module modules/mod_remoteip.so" > dstfl;
@@ -195,15 +205,19 @@ BEGIN {
           print "#LoadModule xml2enc_module modules/mod_xml2enc.so" > dstfl;
           continue;
         }
-        gsub( /@@ServerRoot@@/,   serverroot );
-        gsub( /@exp_cgidir@/,     serverroot "/cgi-bin" );
-        gsub( /@exp_sysconfdir@/, serverroot "/conf" );
-        gsub( /@exp_errordir@/,   serverroot "/error" );
-        gsub( /@exp_htdocsdir@/,  serverroot "/htdocs" );
-        gsub( /@exp_iconsdir@/,   serverroot "/icons" );
-        gsub( /@exp_manualdir@/,  serverroot "/manual" );
-        gsub( /@exp_runtimedir@/, serverroot "/logs" );
-        if ( gsub( /@exp_logfiledir@/, serverroot "/logs" ) ||
+        if ( /^ServerRoot / ) {
+          print "Define SRVROOT \"" serverroot "\"" > dstfl;
+          print "" > dstfl;
+        }
+        gsub( /@@ServerRoot@@/,   "\${SRVROOT}" );
+        gsub( /@exp_cgidir@/,     "\${SRVROOT}" "/cgi-bin" );
+        gsub( /@exp_sysconfdir@/, "\${SRVROOT}" "/conf" );
+        gsub( /@exp_errordir@/,   "\${SRVROOT}" "/error" );
+        gsub( /@exp_htdocsdir@/,  "\${SRVROOT}" "/htdocs" );
+        gsub( /@exp_iconsdir@/,   "\${SRVROOT}" "/icons" );
+        gsub( /@exp_manualdir@/,  "\${SRVROOT}" "/manual" );
+        gsub( /@exp_runtimedir@/, "\${SRVROOT}" "/logs" );
+        if ( gsub( /@exp_logfiledir@/, "\${SRVROOT}" "/logs" ) ||
              gsub( /@rel_logfiledir@/, "logs" ) ) {
           gsub( /_log"/, ".log\"" )
         }
@@ -223,8 +237,8 @@ BEGIN {
 
       if ( close(dstfl) >= 0 ) {
         print "Rewrote " srcfl "\n to " dstfl > tstfl;
-        gsub(/\//, "\\", srcfl);
         if ( sourceroot != "docs/conf/" ) {
+          gsub(/\//, "\\", srcfl);
           if (system("del 2>NUL \"" srcfl "\"")) {
             print "Failed to remove " srcfl > tstfl;
           } else {