X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/ecc307a0d31b150d93330795398268814b249ff4..38971ee6cddd6f7a18b9dcfb050c8c5688f04bdf:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index b34eb56..e2f70d3 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -68,13 +68,19 @@ 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] =>
-		    (case String.fields (fn ch => ch = #"/") rest of
-			 port :: _ =>
-			 (case Int.fromString port of
-			      NONE => default ()
-			    | SOME n => n > 1024 orelse default ())
-		       | _ => default ())
+		    "http" :: "//localhost" :: 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 ()
+		    end
 		  | _ => default ()
 	    end)
 
@@ -597,9 +603,9 @@ val () = Env.action_three "localProxyRewrite"
 	 ("from", Env.string, "to", Env.string, "port", Env.int)
 	 (fn (from, to, port) =>
 	     (checkRewrite ();
-	      write "\tRewriteRule\t";
+	      write "\tRewriteRule\t\"";
 	      write from;
-	      write "\thttp://localhost:";
+	      write "\"\thttp://localhost:";
 	      write (Int.toString port);
 	      write "/";
 	      write to;
@@ -627,10 +633,11 @@ val () = Env.action_three "rewriteRule"
 	 ("from", Env.string, "to", Env.string, "flags", Env.list flag)
 	 (fn (from, to, flags) =>
 	     (checkRewrite ();
-	      write "\tRewriteRule\t";
+	      write "\tRewriteRule\t\"";
 	      write from;
-	      write "\t";
+	      write "\"\t\"";
 	      write to;
+	      write "\"";
 	      case flags of
 		  [] => ()
 		| flag::rest => (write " [";
@@ -644,10 +651,11 @@ val () = Env.action_three "rewriteCond"
 	 ("test", Env.string, "pattern", Env.string, "flags", Env.list cond_flag)
 	 (fn (from, to, flags) =>
 	     (checkRewrite ();
-	      write "\tRewriteCond\t";
+	      write "\tRewriteCond\t\"";
 	      write from;
-	      write "\t";
+	      write "\"\t\"";
 	      write to;
+	      write "\"";
 	      case flags of
 		  [] => ()
 		| flag::rest => (write " [";
@@ -661,9 +669,9 @@ val () = Env.action_one "rewriteBase"
 	 ("prefix", Env.string)
 	 (fn prefix =>
 	     (checkRewrite ();
-	      write "\tRewriteBase\t";
+	      write "\tRewriteBase\t\"";
 	      write prefix;
-	      write "\n"))
+	      write "\"\n"))
 
 val () = Env.action_one "rewriteLogLevel"
 	 ("level", Env.int)