Merge branch '0.6.0-milestone' into unix_server

CHANGES.md

@@ -1,5 +1,22 @@
+0.6.0
+----
+* Fix stack level too deep when writing to ChunkStream
+* Use HTTP::Resonse::Status::REASONS table ( HTTP::Response::* deprecated in the HTTP gem )
+* Use Timers 3.0.0 API
+* Case-insensitivity for header field names ( i.e. in case a proxy downcases them )
+* Catch when openssl sometimes fires ECONNRESET, EPIPE, ETIMEDOUT, EHOSTUNREACH and  as an error
+* Unused `optimize` socket modifications taken off all server implementations
+* Fixed 404 error in roundtrip example
+* Fixed "Reel::StateError: already processing a request" when client is killed
+* Numerous updates to rspec.
+* Switched to websocket/driver and improved websocket handling
+* Implement DriverEnvironment to fix websocket example
+* Refactored Server::HTTPS to be more idomatic
+* Fixed jRuby related test failures
+* Fixed "ArgumentError: Data object has already been freed" caused by underlying parser.
+
 0.5.0 (2014-04-15)
-------------------
+----
 * Reel::Server(::SSL) renamed to Reel::Server::HTTP and Reel::Server::HTTPS
 * New Reel::Spy API for observing requests and responses from the server
 * Fixes to chunked encoding handling

lib/reel/connection.rb

@@ -56,7 +56,7 @@ def request
 
       req = @parser.current_request
       @request_fsm.transition :headers
-      @keepalive = false if req[CONNECTION] == CLOSE || req.version == HTTP_VERSION_1_0
+      @keepalive = false if req.nil? || req[CONNECTION] == CLOSE || req.version == HTTP_VERSION_1_0
       @current_request = req
 
       req

lib/reel/request/parser.rb

@@ -43,7 +43,11 @@ def current_request
 
       def readpartial(size = @buffer_size)
         bytes = @socket.readpartial(size)
-        @parser << bytes
+        begin
+          @parser << bytes
+        rescue ArgumentError
+          raise Errno::EPIPE
+        end
       end
 
       #

lib/reel/server/https.rb

@@ -27,12 +27,11 @@ def initialize(host, port, options={}, &callback)
 
         # if verify_mode isn't explicitly set, verify peers if we've
         # been provided CA information that would enable us to do so
-        ssl_context.verify_mode = case
-        when options.include?(:verify_mode)
+        ssl_context.verify_mode = if options.include?(:verify_mode)
           options[:verify_mode]
-        when options.include?(:ca_file)
+        elsif options.include?(:ca_file)
           OpenSSL::SSL::VERIFY_PEER
-        when options.include?(:ca_path)
+        elsif options.include?(:ca_path)
           OpenSSL::SSL::VERIFY_PEER
         else
           OpenSSL::SSL::VERIFY_NONE
@@ -50,10 +49,11 @@ def run
         loop do
           begin
             socket = @server.accept
-          rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::EPIPE,
-                 Errno::ETIMEDOUT, Errno::EHOSTUNREACH => ex
+          rescue OpenSSL::SSL::SSLError, EOFError,
+                Errno::ECONNRESET, Errno::EPIPE, Errno::EINPROGRESS,
+                Errno::ETIMEDOUT, Errno::EHOSTUNREACH => ex
             Logger.warn "Error accepting SSLSocket: #{ex.class}: #{ex.to_s}"
-            retry
+            next
           end
 
           async.handle_connection socket

spec/reel/https_server_spec.rb

@@ -2,6 +2,7 @@
 require 'net/http'
 
 RSpec.describe Reel::Server::HTTPS do
+
   let(:example_https_port) { example_port + 1 }
   let(:example_url)      { "https://#{example_addr}:#{example_https_port}#{example_path}" }
   let(:endpoint)         { URI(example_url) }
@@ -44,7 +45,7 @@
     raise ex if ex
   end
 
-  it 'verifies client SSL certs when provided with a CA' do
+  it "verifies client SSL certs when provided with a CA" do
     ex = nil
 
     handler = proc do |connection|
@@ -75,7 +76,7 @@
     raise ex if ex
   end
 
-  it %{fails to verify client certificates that aren't signed} do
+  it "fails to verify client certificates that aren't signed" do
     ex = nil
 
     handler = proc do |connection|