Merge remote-tracking branch 'upstream/master'

jplock · Jul 12, 2012 · 0a8a5ab · 0a8a5ab
2 parents 54226a3 + f7c9a2b
commit 0a8a5ab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/main.js b/main.js
@@ -319,7 +319,7 @@ Request.prototype.init = function (options) {
   }
 
   self.once('pipe', function (src) {
-    if (self.ntick) throw new Error("You cannot pipe to this stream after the first nextTick() after creation of the request stream.")
+    if (self.ntick && self._started) throw new Error("You cannot pipe to this stream after the outbound request has started.")
     self.src = src
     if (isReadStream(src)) {
       if (!self.headers['content-type'] && !self.headers['Content-Type'])
@@ -749,6 +749,7 @@ Request.prototype.oauth = function (_oauth) {
       // skip 
     } else {
       delete oa['oauth_'+i]
+      delete oa[i]
     }
   }
   this.headers.Authorization =