Put 'RewriteEngine on' in the right places; print domain name upon encountering a...

diff --git a/src/main.sml b/src/main.sml
index d769a61..ba60764 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -176,7 +176,7 @@ fun eval fname =
            raise ErrorMsg.Error
        else
            Eval.exec (Defaults.eInit ()) body'
-      | NONE => raise ErrorMsg.Error
+      | NONE => ()
 
 fun eval' fname =
     case reduce fname of
@@ -185,7 +185,7 @@ fun eval' fname =
            raise ErrorMsg.Error
        else
            ignore (Eval.exec' (Defaults.eInit ()) body')
-      | NONE => raise ErrorMsg.Error
+      | NONE => ()
 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
@@ -288,7 +288,7 @@ fun requestDir dname =
        val (_, files) = Order.order (SOME b) files
 
        val _ = if !ErrorMsg.anyErrors then
-                   raise ErrorMsg.Error
+                   (print "J\n";raise ErrorMsg.Error)
                else
                    ()
 

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 966240c..7cdc613 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -539,7 +539,7 @@ val () = Env.container_one "directory"
 
 fun checkRewrite () =
     if !inLocal then
-       if !rewriteEnabled orelse !localRewriteEnabled then
+       if !localRewriteEnabled then
            ()
        else
            (write "\tRewriteEngine on\n";

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index 48a2b03..20c3c10 100644 (file)
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -71,7 +71,8 @@ val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
 
 fun writeRecord (evs, r) =
     case !dns of
-       NONE => print "Warning: DNS directive ignored because no master DNS server is configured for this domain\n"
+       NONE => print ("Warning: DNS directive for " ^ Domain.currentDomain ()
+                      ^ " ignored because no master DNS server is configured for this domain\n")
       | SOME files =>
        let
            fun write s = #write files s