enable pipelining support for no-body requests (ex: HEAD) - closes ig…

…rigorik#99

em-http-request.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "eventmachine", ">= 1.0.0.beta.3"
   s.add_dependency "addressable", ">= 2.2.3"
-  s.add_dependency "http_parser.rb", ">= 0.5.2"
+  s.add_dependency "http_parser.rb", ">= 0.5.3"
   s.add_dependency "em-socksify"
   s.add_dependency "cookiejar"
 

lib/em-http/http_client_options.rb

@@ -28,6 +28,7 @@ def initialize(uri, options, method)
   def follow_redirect?; @followed < @redirects; end
   def http_proxy?; @proxy && [nil, :http].include?(@proxy[:type]); end
   def ssl?; @uri.scheme == "https" || @uri.port == 443; end
+  def no_body?; @method == "HEAD"; end
 
   def set_uri(uri)
     uri = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI::parse(uri.to_s)

lib/em-http/http_connection.rb

@@ -106,6 +106,7 @@ def post_init
       @p.header_value_type = :mixed
       @p.on_headers_complete = proc do |h|
         client.parse_response_header(h, @p.http_version, @p.status_code)
+        :reset if client.req.no_body?
       end
 
       @p.on_body = proc do |b|
@@ -187,8 +188,8 @@ def stream_file_data(filename, args = {})
 
     private
 
-    def client
-      @clients.first
-    end
+      def client
+        @clients.first
+      end
   end
 end

spec/pipelining_spec.rb

@@ -23,7 +23,7 @@
           stop.call
         }
 
-        pipe2.errback { p pipe2; failed(conn) }
+        pipe2.errback { failed(conn) }
         pipe2.callback {
           processed += 1
           pipe2.response_header.status.should == 200
@@ -33,6 +33,34 @@
 
       end
     end
+
+    it "should perform successful pipelined HEAD requests" do
+      EventMachine.run do
+        conn = EventMachine::HttpRequest.new('http://www.igvita.com/')
+
+        pipe1 = conn.head :keepalive => true
+        pipe2 = conn.head :path => '/about/', :keepalive => true
+
+        processed = 0
+        stop = proc { EM.stop if processed == 2}
+
+        pipe1.errback { failed(conn) }
+        pipe1.callback {
+          processed += 1
+          pipe1.response_header.status.should == 200
+          stop.call
+        }
+
+        pipe2.errback { failed(conn) }
+        pipe2.callback {
+          processed += 1
+          pipe2.response_header.status.should == 200
+          stop.call
+        }
+
+      end
+
+    end
   end
 
-end
+end