Merge branch 'v0.4'

Conflicts:
	src/platform_sunos.cc
	test/simple/test-os.js

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/fs.js b/lib/fs.js
index efcc7a8431..89dc2142b3 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -838,11 +838,12 @@ var ReadStream = fs.ReadStream = function(path, options) {
 
   if (this.encoding) this.setEncoding(this.encoding);
 
-  if (this.start !== undefined || this.end !== undefined) {
-    if (this.start === undefined || this.end === undefined) {
-      this.emit('error', new Error('Both start and end are needed ' +
-                                   'for range streaming.'));
-    } else if (this.start > this.end) {
+  if (this.start !== undefined) {
+    if (this.end === undefined) {
+      this.end = Infinity;
+    }
+
+    if (this.start > this.end) {
       this.emit('error', new Error('start must be <= end'));
     } else {
       this._firstRead = true;