Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed replacement for windows URLs, issue #331 #332

Merged
merged 2 commits into from
Jan 17, 2017
Merged

Fixed replacement for windows URLs, issue #331 #332

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d8124
Fixed replacement for windows URLs
bneumann Jan 7, 2017
7b85447
remove log entry
bneumann Jan 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/http_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ var deviceFormatter = require('./api_formats/siren/device.siren');
var rels = require('zetta-rels');

var querytopic = require('./query_topic');
console.log(url);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be sure to remove this log statement when you get a chance :) Otherwise looking good pending that issue with a test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah sorry for that, just saw it too while executing the tests and was wonder where the heck it came from :)


var ZettaHttpServer = module.exports = function(zettaInstance, options) {
var self = this;
Expand Down Expand Up @@ -272,8 +273,7 @@ ZettaHttpServer.prototype.wireUpWebSocketForEvent = function(ws, host, p) {
}
}
}

return protocol + '://' + path.join(host, ws.upgradeReq.url);
return (protocol + '://' + path.join(host, ws.upgradeReq.url)).replace(/\\/g, '/');
};

ws._env.helpers.url = {};
Expand Down