added mod_ssl to httpd.conf for BSD socket build;

some more fixes to httpd-ssl.conf; sync'd with r515403.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551196 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 3b5fb3530433efdb1eb80f7809c5e1b44e7160e6..f340c665408bc833b6c3acf92870139b44343ae5 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -338,9 +338,9 @@ install :: nlms FORCE
        -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
+       -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 SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
+       -awk -v BDIR=$(BASEDIR) -v NWSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
 endif
        $(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

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 0956ce98c2cc437c68a5223d21a18abd67cf9478..d7fa39c1d1d3b470f27943a7f4dea2f202c20c55 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -35,6 +35,7 @@ BEGIN {
     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"] = ""
 }
@@ -85,12 +86,23 @@ 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,/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,/^SSLMutex +"file:@exp_runtimedir@\/ssl_mutex"/) {
+    sub(/"file:@exp_runtimedir@\/ssl_mutex"/, "default")
 }
 
 match ($0,/@@.*@@/) {
@@ -119,7 +131,7 @@ match ($0,/@nonssl_.*@/) {
 
 
 END {
-    if (SSL) {
+    if (NWSSL) {
        print ""
        print "#"
        print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "