From 57b0d1f123182eb112a32c07bdc8369115911b22 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Wed, 10 Aug 2022 09:31:37 -0400
Subject: [PATCH] check block flag on error

---
 http2.d | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/http2.d b/http2.d
index 98a05ec..f232606 100644
--- a/http2.d
+++ b/http2.d
@@ -1336,10 +1336,7 @@ class HttpRequest {
 		// The key is the *domain name* and the port. Multiple domains on the same address will have separate connections.
 		Socket[][string] socketsPerHost;
 
-		void loseSocket(string host, ushort port, bool ssl, Socket s) {
-			import std.string;
-			auto key = format("http%s://%s:%s", ssl ? "s" : "", host, port);
-
+		void loseSocketByKey(string key, Socket s) {
 			if(auto list = key in socketsPerHost) {
 				for(int a = 0; a < (*list).length; a++) {
 					if((*list)[a] is s) {
@@ -1353,6 +1350,13 @@ class HttpRequest {
 			}
 		}
 
+		void loseSocket(string host, ushort port, bool ssl, Socket s) {
+			import std.string;
+			auto key = format("http%s://%s:%s", ssl ? "s" : "", host, port);
+
+			loseSocketByKey(key, s);
+		}
+
 		Socket getOpenSocketOnHost(string proxy, string host, ushort port, bool ssl, string unixSocketPath, bool verifyPeer) {
 			Socket openNewConnection() {
 				Socket socket;
@@ -1789,6 +1793,9 @@ class HttpRequest {
 						auto sent = sock.send(request.sendBuffer);
 						debug(arsd_http2_verbose) writeln(cast(void*) sock, "<send>", cast(string) request.sendBuffer, "</send>");
 						if(sent <= 0) {
+							if(wouldHaveBlocked())
+								continue;
+
 							request.state = State.aborted;
 
 							request.responseData.code = 3;
@@ -1814,6 +1821,8 @@ class HttpRequest {
 						auto got = sock.receive(buffer);
 						debug(arsd_http2_verbose) { if(got < 0) writeln(lastSocketError); else writeln("====PACKET ",got,"=====",cast(string)buffer[0 .. got],"===/PACKET==="); }
 						if(got < 0) {
+							if(wouldHaveBlocked())
+								continue;
 							debug(arsd_http2) writeln("receive error");
 							if(request.state != State.complete) {
 								request.state = State.aborted;