Skip to content
This repository has been archived by the owner on Feb 9, 2023. It is now read-only.

Commit

Permalink
Fix URL concatenation
Browse files Browse the repository at this point in the history
Some servers (*cough*Cloudfront*cough*) reject double-slashes, so blind
string concatenation (nodejs/node-v0.x-archive#2216 (comment))
is not adequate to combine URLs.
  • Loading branch information
wearhere committed Dec 20, 2015
1 parent 1ac99a4 commit 7a5e2d6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.js
Expand Up @@ -15,6 +15,7 @@ Npm.depends({
"ncp": "2.0.0",
"rimraf": "2.4.4",
"semver": "5.1.0",
"url-join": "0.0.1"
});

Package.on_use(function (api) {
Expand Down
4 changes: 2 additions & 2 deletions server/downloadUrls.js
@@ -1,4 +1,4 @@
var path = Npm.require('path');
var urlJoin = Npm.require('url-join');

DOWNLOAD_URLS = {};

Expand All @@ -7,7 +7,7 @@ var latestVersion = electronSettings.version;
if (electronSettings.downloadUrls) {
if (electronSettings.downloadUrls.win32) {
// 'AppSetup.exe' refers to the output of `grunt-electron-installer`.
DOWNLOAD_URLS['win32'] = path.join(electronSettings.downloadUrls.win32, electronSettings.name + 'Setup.exe');
DOWNLOAD_URLS['win32'] = urlJoin(electronSettings.downloadUrls.win32, electronSettings.name + 'Setup.exe');
}
if (electronSettings.downloadUrls.darwin){
DOWNLOAD_URLS['darwin'] = electronSettings.downloadUrls.darwin.replace('{{version}}', latestVersion);
Expand Down
4 changes: 2 additions & 2 deletions server/serveUpdateFeed.js
@@ -1,5 +1,6 @@
var path = Npm.require('path');
var semver = Npm.require('semver');
var urlJoin = Npm.require('url-join');
var electronSettings = Meteor.settings.electron || {};
var latestVersion = electronSettings.version;

Expand Down Expand Up @@ -42,8 +43,7 @@ serveUpdateFeed = function() {
//first strip off the UPDATE_FEED_PATH
var path = req.url.split(UPDATE_FEED_PATH)[1];
res.statusCode = 302;
// Can't use `path.join` since this is a URL. Two slashes in a row are fine if present.
res.setHeader("Location", windowsDownloadPrefix + '/' + path);
res.setHeader("Location", urlJoin(windowsDownloadPrefix, path));
res.end();
});
}
Expand Down

0 comments on commit 7a5e2d6

Please sign in to comment.