Merge branch 'refs/heads/0.4'

cboden · cboden · commit 8335f30f3118 · 2014-05-19T11:43:56.000-04:00
diff --git a/src/Socket/Connection.php b/src/Socket/Connection.php
@@ -15,7 +15,7 @@ public function handleData($stream)
             $this->emit('data', array($data, $this));
         }
 
-        if ('' === $data || false === $data || feof($stream)) {
+        if ('' === $data || false === $data || !is_resource($stream) || feof($stream)) {
             $this->end();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function handleData($stream)`
`15`	`15`	`$this->emit('data', array($data, $this));`
`16`	`16`	`}`
`17`	`17`
`18`		`- if ('' === $data \|\| false === $data \|\| feof($stream)) {`
	`18`	`+ if ('' === $data \|\| false === $data \|\| !is_resource($stream) \|\| feof($stream)) {`
`19`	`19`	`$this->end();`
`20`	`20`	`}`
`21`	`21`	`}`