diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-21 13:14:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-21 13:14:17 +0100 |
| commit | 80a5cbd5dcc9d12e196fdd45097fece9cc71e687 (patch) | |
| tree | ca9f85e2b314d63133e2a80274626ff72dc28789 /js/bin/HttpServer.js | |
| parent | Fix for running tests with ES5 (diff) | |
| download | ice-80a5cbd5dcc9d12e196fdd45097fece9cc71e687.tar.bz2 ice-80a5cbd5dcc9d12e196fdd45097fece9cc71e687.tar.xz ice-80a5cbd5dcc9d12e196fdd45097fece9cc71e687.zip | |
Additional fixes for Edge/IE, only run with ES5
Diffstat (limited to 'js/bin/HttpServer.js')
| -rw-r--r-- | js/bin/HttpServer.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js index 29e9cb1a1b2..fcfd68ef4d4 100644 --- a/js/bin/HttpServer.js +++ b/js/bin/HttpServer.js @@ -209,13 +209,14 @@ function Init() basePath = this._basePath; } - var filePath = path.resolve(path.join(basePath, req.url.pathname)); + var filePath = req.url.pathname; if(filePath.indexOf("es5/") !== -1 && path.extname(filePath) != ".js") { // We only host JS files in the es5 subdirectory, other files // (such as config/escapes.cfg are in test) filePath = filePath.replace("es5/", "") } + filePath = path.resolve(path.join(basePath, filePath)) // // If OPTIMIZE is set resolve Ice libraries to the corresponding minified |