Fixing for non-proxy case.

request · Dec 4, 2010 · 85e3d97 · 85e3d97
1 parent 45d41df
commit 85e3d97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/main.js b/main.js
@@ -63,7 +63,7 @@ function request (options, callback) {
   if (options.uri.auth && !options.headers.authorization) {
     options.headers.authorization = "Basic " + toBase64(options.uri.auth);
   }
-  if (options.proxy.auth && !options.headers['proxy-authorization']) {
+  if (options.proxy && options.proxy.auth && !options.headers['proxy-authorization']) {
     options.headers['proxy-authorization'] = "Basic " + toBase64(options.proxy.auth);
   }
 

diff --git a/tests/couch.js b/tests/couch.js
@@ -38,6 +38,7 @@ request({uri:'http://mikeal.couchone.com/testjs', method:'POST', headers: h, bod
 
 var options = {uri:'http://gmail.com'};
 request(options, function (error, response, body) {
+  if (error) throw error;
   assert.equal(response.statusCode, 200);
   assert.equal(options.uri.host, 'www.google.com');
   assert.equal(response.socket.port, 443);