Merge branch 'refs/heads/0.3' into 0.4

cboden · cboden · commit 263bfa6c419c · 2014-03-30T13:19:02.000-04:00
Conflicts:
	CHANGELOG.md
	src/Stream/Buffer.php
diff --git a/Connection.php b/Connection.php
@@ -21,7 +21,9 @@ public function handleData($stream)
     public function handleClose()
     {
         if (is_resource($this->stream)) {
+            // http://chat.stackoverflow.com/transcript/message/7727858#7727858
             stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
+            stream_set_blocking($this->stream, false);
             fclose($this->stream);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@ public function handleData($stream)`
`21`	`21`	`public function handleClose()`
`22`	`22`	`{`
`23`	`23`	`if (is_resource($this->stream)) {`
	`24`	`+ // http://chat.stackoverflow.com/transcript/message/7727858#7727858`
`24`	`25`	`stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);`
	`26`	`+ stream_set_blocking($this->stream, false);`
`25`	`27`	`fclose($this->stream);`
`26`	`28`	`}`
`27`	`29`	`}`