diff --git a/lib/async/http/protocol/http1/server.rb b/lib/async/http/protocol/http1/server.rb
index 902d4cbd..bd16ffdf 100644
--- a/lib/async/http/protocol/http1/server.rb
+++ b/lib/async/http/protocol/http1/server.rb
@@ -45,7 +45,9 @@ def next_request
 						
 						return request
 					rescue Async::TimeoutError
-						fail_request(408)
+						# For an interesting discussion about this behaviour, see https://trac.nginx.org/nginx/ticket/1005
+						# If you enable this, you will see some spec failures...
+						# fail_request(408)
 						raise
 					rescue
 						fail_request(400)
@@ -54,6 +56,8 @@ def next_request
 					
 					# Server loop.
 					def each(task: Task.current)
+						task.annotate("#{version} reading requests for #{self.class}.")
+						
 						while request = next_request
 							response = yield(request, self)
 							
diff --git a/lib/async/http/protocol/http2/server.rb b/lib/async/http/protocol/http2/server.rb
index f3b8ea7c..4caa877e 100644
--- a/lib/async/http/protocol/http2/server.rb
+++ b/lib/async/http/protocol/http2/server.rb
@@ -52,17 +52,18 @@ def accept_stream(stream_id)
 					end
 					
 					def close(error = nil)
-						# This invokes Framer#close which closes the stream:
-						super
-						
 						if @requests
 							# Stop the request loop:
-							@requests.enqueue nil
+							@requests.enqueue(nil)
 							@requests = nil
 						end
+						
+						super
 					end
 					
-					def each
+					def each(task: Task.current)
+						task.annotate("#{version} reading requests for #{self.class}.")
+						
 						# It's possible the connection has died before we get here...
 						@requests&.async do |task, request|
 							task.annotate("Incoming request: #{request.method} #{request.path.inspect}.")
@@ -80,6 +81,8 @@ def each
 								request.send_response(response)
 							end
 						end
+						
+						# Maybe we should add some synchronisation here - i.e. only exit once all requests are finished.
 					end
 				end
 			end
diff --git a/lib/async/http/version.rb b/lib/async/http/version.rb
index 3d208fb8..e500692c 100644
--- a/lib/async/http/version.rb
+++ b/lib/async/http/version.rb
@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.51.2"
+		VERSION = "0.51.5"
 	end
 end
diff --git a/spec/async/http/protocol/shared_examples.rb b/spec/async/http/protocol/shared_examples.rb
index 8db26a0a..6c7326dd 100644
--- a/spec/async/http/protocol/shared_examples.rb
+++ b/spec/async/http/protocol/shared_examples.rb
@@ -167,6 +167,25 @@
 			expect(server.scheme).to be == "http"
 		end
 		
+		it "disconnects slow clients" do
+			response = client.get("/")
+			response.read
+			
+			# We expect this connection to be closed:
+			connection = response.connection
+			
+			reactor.sleep(1.0)
+			
+			response = client.get("/")
+			response.read
+			
+			expect(connection).to_not be_reusable
+			
+			# client.close
+			# reactor.sleep(0.1)
+			# reactor.print_hierarchy
+		end
+		
 		context 'using GET method' do
 			let(:expected) {"GET #{protocol::VERSION}"}
 			
diff --git a/spec/async/http/server_context.rb b/spec/async/http/server_context.rb
index 12e9e5d9..80251bd4 100644
--- a/spec/async/http/server_context.rb
+++ b/spec/async/http/server_context.rb
@@ -26,7 +26,7 @@
 	include_context Async::RSpec::Reactor
 	
 	let(:protocol) {described_class}
-	let(:endpoint) {Async::HTTP::Endpoint.parse('http://127.0.0.1:9294', reuse_port: true)}
+	let(:endpoint) {Async::HTTP::Endpoint.parse('http://127.0.0.1:9294', timeout: 0.8, reuse_port: true)}
 	
 	let(:retries) {1}
 	let!(:client) {Async::HTTP::Client.new(endpoint, protocol, retries: retries)}