X-Git-Url: http://git.hcoop.net/clinton/domtool2.git/blobdiff_plain/fb09779a844e6ebb2388d68ef1170c816b6bc07c..c6923cdb41ca9de48fb9bda822e5954dd376895b:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index adc579e..b5edd64 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -1,5 +1,6 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
  * Copyright (c) 2006-2009, Adam Chlipala
+ * Copyright (c) 2013 Clinton Ebadi
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -68,18 +69,22 @@ val _ = Env.type_one "proxy_target"
 		fun default () = List.exists (fn s' => s = s') Config.Apache.proxyTargets
 	    in
 		case String.fields (fn ch => ch = #":") s of
-		    "http" :: "//localhost" :: rest =>
+		    "http" :: host :: rest =>
 		    let
 			val rest = String.concatWith ":" rest
 		    in
-			CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
-						 andalso ch <> #"\"" andalso ch <> #"'") rest
-			andalso case String.fields (fn ch => ch = #"/") rest of
-				    port :: _ =>
-				    (case Int.fromString port of
-					 NONE => default ()
-				       | SOME n => n > 1024 orelse default ())
-				  | _ => default ()
+			if List.exists (fn h' => host = h') (map (fn h => String.concat ["//", h]) Config.Apache.proxyHosts)
+			then
+			    CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
+						     andalso ch <> #"\"" andalso ch <> #"'") rest
+			    andalso case String.fields (fn ch => ch = #"/") rest of
+					port :: _ =>
+					(case Int.fromString port of
+					     NONE => default ()
+					   | SOME n => n > 1024 orelse default ())
+				      | _ => default ()
+			else
+			    default ()
 		    end
 		  | _ => default ()
 	    end)
@@ -202,6 +207,7 @@ val apache_option = fn (EVar "execCGI", _) => SOME "ExecCGI"
 		     | (EVar "includesNOEXEC", _) => SOME "IncludesNOEXEC"
 		     | (EVar "indexes", _) => SOME "Indexes"
 		     | (EVar "followSymLinks", _) => SOME "FollowSymLinks"
+		     | (EVar "multiViews", _) => SOME "MultiViews"
 		     | _ => NONE
 
 val autoindex_width = fn (EVar "autofit", _) => SOME "*"