Updated https support

waveto · waveto · commit fbad5dc06216 · 2010-04-15T06:17:22.000+01:00
diff --git a/lib/net.js b/lib/net.js
@@ -303,7 +303,8 @@ function initStream (self) {
         }
         if (secureBytesRead === null && !self.server) {
           // Client needs to write as part of handshake
-          this._writeWatcher.start();
+          self._writeWatcher.start();
+	  return;
         }
       } else {
         bytesRead = read(self.fd,
@@ -312,7 +313,6 @@ function initStream (self) {
                        pool.length - pool.used);
       }
     } catch (e) {
-      if (this.forceClose) this.forceClose(e);
       self.destroy(e);
       return;
     }
@@ -523,7 +523,7 @@ Stream.prototype._writeOut = function (data, encoding) {
     if (this.secure) return false;
     else throw new Error('Stream is not writable');
   }
-  if (data.length == 0) return true;
+  if (!this.secure && data.length == 0) return true;
 
   var buffer, off, len;
   var bytesWritten, charsWritten;

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,8 @@ function initStream (self) {`
`303`	`303`	`}`
`304`	`304`	`if (secureBytesRead === null && !self.server) {`
`305`	`305`	`// Client needs to write as part of handshake`
`306`		`- this._writeWatcher.start();`
	`306`	`+ self._writeWatcher.start();`
	`307`	`+ return;`
`307`	`308`	`}`
`308`	`309`	`} else {`
`309`	`310`	`bytesRead = read(self.fd,`
`@@ -312,7 +313,6 @@ function initStream (self) {`
`312`	`313`	`pool.length - pool.used);`
`313`	`314`	`}`
`314`	`315`	`} catch (e) {`
`315`		`- if (this.forceClose) this.forceClose(e);`
`316`	`316`	`self.destroy(e);`
`317`	`317`	`return;`
`318`	`318`	`}`
`@@ -523,7 +523,7 @@ Stream.prototype._writeOut = function (data, encoding) {`
`523`	`523`	`if (this.secure) return false;`
`524`	`524`	`else throw new Error('Stream is not writable');`
`525`	`525`	`}`
`526`		`- if (data.length == 0) return true;`
	`526`	`+ if (!this.secure && data.length == 0) return true;`
`527`	`527`
`528`	`528`	`var buffer, off, len;`
`529`	`529`	`var bytesWritten, charsWritten;`