github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass http_proxy to the emulator if the httpProxyPort is set

Browse Source 
It doesn't work for Cordova, though it does work for the browser

This may get fixed later
This commit is contained in:
Justin SB
2014-09-09 13:02:32 -07:00
parent 1103261918
commit 2fc07ee801
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/commands-cordova.js
View File

@@ -684,11 +684,11 @@ var execCordovaOnPlatform = function (localPath, platformName, options) {
} else {
verboseLog('Running emulator:', localCordova, args);
var emulatorOptions = { verbose: options.verbose, cwd: cordovaPath };
emulatorOptions.env = {};
emulatorOptions.env = _.extend({}, process.env);
if (options.httpProxyPort) {
// XXX: Is this Android only?
// XXX: Is 10.0.2.2 always the IP?
emulatorOptions.env['http_proxy'] = '10.0.2.2:' + options.httpProxyPort;
// This is odd; the IP address is on the host, not inside the emulator
emulatorOptions.env['http_proxy'] = '127.0.0.1:' + options.httpProxyPort;
}
execFileAsyncOrThrow(
localCordova, args,