From 54d8d5eee39402a93a9926fa2b19fb32da1a1b02 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Mon, 23 Mar 2015 16:31:02 -0700
Subject: [PATCH] Fix http-server on Windows

---
 lime/project/ProjectXMLParser.hx           | 26 ++++++++++++++--------
 templates/bin/node/http-server/http-server |  9 +++++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/lime/project/ProjectXMLParser.hx b/lime/project/ProjectXMLParser.hx
index 2e0256fad..fbb6c1bd9 100644
--- a/lime/project/ProjectXMLParser.hx
+++ b/lime/project/ProjectXMLParser.hx
@@ -22,7 +22,7 @@ class ProjectXMLParser extends HXProject {
 	
 	public var includePaths:Array <String>;
 	
-	private static var varMatch = new EReg("\\${(.*?)}", "");
+	private static var varMatch = new EReg ("\\${(.*?)}", "");
 	
 	
 	public function new (path:String = "", defines:Map <String, Dynamic> = null, includePaths:Array <String> = null, useExtensionPath:Bool = false) {
@@ -97,7 +97,7 @@ class ProjectXMLParser extends HXProject {
 			
 			defines.set ("html5", "1");
 			
-		} else if (targetFlags.exists ("cpp") || ((platformType != PlatformType.WEB) && !targetFlags.exists("html5")) || target == Platform.EMSCRIPTEN) {
+		} else if (targetFlags.exists ("cpp") || ((platformType != PlatformType.WEB) && !targetFlags.exists ("html5")) || target == Platform.EMSCRIPTEN) {
 			
 			defines.set ("native", "1");
 			defines.set ("cpp", "1");
@@ -1157,16 +1157,24 @@ class ProjectXMLParser extends HXProject {
 					
 					case "haxedef":
 						
-						var name = substitute (element.att.name);
-						var value = "";
-						
-						if (element.has.value) {
+						if (element.has.remove) {
 							
-							value = substitute (element.att.value);
+							haxedefs.remove (substitute (element.att.remove));
+							
+						} else {
+							
+							var name = substitute (element.att.name);
+							var value = "";
+							
+							if (element.has.value) {
+								
+								value = substitute (element.att.value);
+								
+							}
+							
+							haxedefs.set (name, value);
 							
 						}
-						
-						haxedefs.set (name, value);
 					
 					case "haxeflag", "compilerflag":
 						
diff --git a/templates/bin/node/http-server/http-server b/templates/bin/node/http-server/http-server
index 2c073630c..8fa1e42a3 100755
--- a/templates/bin/node/http-server/http-server
+++ b/templates/bin/node/http-server/http-server
@@ -81,16 +81,19 @@ function listen(port) {
 
   var server = httpServer.createServer(options);
   server.listen(port, host, function() {
-    var uri = [ssl ? 'https' : 'http', '://', host, ':', port].join('');
+    var protocol = ssl ? 'https:' : 'http:';
+    var canonical_host = host === "0.0.0.0" ? "localhost" : host;
+    var uri = protocol + '//' + host + ':' + port;
+    var canonical_uri = protocol + '//' + canonical_host + ':' + port;
     log('Starting up http-server, serving '.yellow
       + server.root.cyan
-      + ((ssl) ? ' through'.yellow + ' https'.cyan : '')
+      + (ssl ? ' through'.yellow + ' https'.cyan : '')
       + ' on: '.yellow
       + uri.cyan);
 
     log('Hit CTRL-C to stop the server');
     if (argv.o) {
-      opener(uri);
+      opener(canonical_uri);
     }
   });
 }