wiki-cafe/node-oauth
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dmathieu/fix_http' into not_require_http

Browse Source 
Conflicts:
	lib/oauth2.js
This commit is contained in:
ciaranj 2012-04-24 20:54:49 +01:00
commit 1970e0045e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/oauth2.js
View File

@ -1,6 +1,7 @@
var querystring= require('querystring'), var querystring= require('querystring'),
crypto= require('crypto'), crypto= require('crypto'),
https= require('https'), https= require('https'),
http= require('http'),
URL= require('url'), URL= require('url'),
OAuthUtils= require('./_utils'); OAuthUtils= require('./_utils');
@ -30,7 +31,12 @@ exports.OAuth2.prototype._request= function(method, url, headers, post_body, acc
var creds = crypto.createCredentials({ }); var creds = crypto.createCredentials({ });
var parsedUrl= URL.parse( url, true ); var parsedUrl= URL.parse( url, true );
if( parsedUrl.protocol == "https:" && !parsedUrl.port ) parsedUrl.port= 443; if( parsedUrl.protocol == "https:" && !parsedUrl.port ) {
parsedUrl.port= 443;
http_library = https;
} else {
http_library = http;
}
var realHeaders= {}; var realHeaders= {};
if( headers ) { if( headers ) {
@ -72,7 +78,7 @@ exports.OAuth2.prototype._request= function(method, url, headers, post_body, acc
} }
} }
var request = https.request(options, function (response) { var request = http_library.request(options, function (response) {
response.on("data", function (chunk) { response.on("data", function (chunk) {
result+= chunk result+= chunk
}); });