handle bad HTTP responses, fail the request

eriwen · Mar 10, 2011 · 6d36a5b · 6d36a5b
1 parent 83edb72
commit 6d36a5b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/em-http/http_connection.rb b/lib/em-http/http_connection.rb
@@ -77,7 +77,12 @@ def use(klass)
     end
 
     def receive_data(data)
-      @p << data
+      begin
+        @p << data
+      rescue HTTP::Parser::Error => e
+        c = @clients.shift
+        c.on_error(e.message)
+      end
     end
 
     def connection_completed

diff --git a/lib/em-http/version.rb b/lib/em-http/version.rb
@@ -1,5 +1,5 @@
 module EventMachine
   class HttpRequest
-    VERSION = "1.0.0.beta.1"
+    VERSION = "1.0.0.beta.2"
   end
 end
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
@@ -558,6 +558,19 @@ def failed(http=nil)
         }
       }
     end
+
+    it "should handle invalid HTTP response" do
+      EventMachine.run {
+        @s = StubServer.new("<html></html>")
+
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get
+        http.callback { failed(http) }
+        http.errback {
+          http.error.should_not be_nil
+          EM.stop
+        }
+      }
+    end
   end
 
   it "should stream a file off disk" do