forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check block flag on error

This commit is contained in:
Adam D. Ruppe 2022-08-10 09:31:37 -04:00
parent 0d61b0ef04
commit 57b0d1f123
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
http2.d
View File

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