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

async connect maybe

This commit is contained in:
Adam D. Ruppe 2022-08-10 09:02:18 -04:00
parent ba2823d911
commit 50592d35f3
1 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
http2.d
View File

@ -1095,6 +1095,9 @@ class HttpRequest {
/// sent on the socket yet because the connection is busy. /// sent on the socket yet because the connection is busy.
pendingAvailableConnection, pendingAvailableConnection,
/// connect has been called, but we're waiting on word of success
connecting,
/// The headers are being sent now /// The headers are being sent now
sendingHeaders, sendingHeaders,
@ -1359,8 +1362,10 @@ class HttpRequest {
socket = new SslClientSocket(family(unixSocketPath), SocketType.STREAM, host, verifyPeer); socket = new SslClientSocket(family(unixSocketPath), SocketType.STREAM, host, verifyPeer);
} else } else
throw new Exception("SSL not compiled in"); throw new Exception("SSL not compiled in");
} else } else {
socket = new Socket(family(unixSocketPath), SocketType.STREAM); socket = new Socket(family(unixSocketPath), SocketType.STREAM);
socket.blocking = false;
}
// FIXME: connect timeout? // FIXME: connect timeout?
if(unixSocketPath) { if(unixSocketPath) {
@ -1625,7 +1630,7 @@ class HttpRequest {
if(socket !is null) { if(socket !is null) {
activeRequestOnSocket[socket] = pc; activeRequestOnSocket[socket] = pc;
assert(pc.sendBuffer.length); assert(pc.sendBuffer.length);
pc.state = State.sendingHeaders; pc.state = State.connecting;
removeFromPending[removeFromPendingCount++] = pc; removeFromPending[removeFromPendingCount++] = pc;
} }
@ -1680,7 +1685,7 @@ class HttpRequest {
if(timeo < minTimeout) if(timeo < minTimeout)
minTimeout = timeo; minTimeout = timeo;
if(request.state == State.sendingHeaders || request.state == State.sendingBody) { if(request.state == State.connecting || request.state == State.sendingHeaders || request.state == State.sendingBody) {
writeSet.add(sock); writeSet.add(sock);
hadOne = true; hadOne = true;
} }
@ -1703,7 +1708,10 @@ class HttpRequest {
if(request.timeoutFromInactivity <= now) { if(request.timeoutFromInactivity <= now) {
request.state = HttpRequest.State.aborted; request.state = HttpRequest.State.aborted;
request.responseData.code = 5; request.responseData.code = 5;
request.responseData.codeText = "Request timed out"; if(request.state == State.connecting)
request.responseData.codeText = "Connect timed out";
else
request.responseData.codeText = "Request timed out";
inactive[inactiveCount++] = sock; inactive[inactiveCount++] = sock;
sock.close(); sock.close();
@ -1732,6 +1740,44 @@ class HttpRequest {
// also because openssl will sometimes leave something ready to read even if we haven't // also because openssl will sometimes leave something ready to read even if we haven't
// sent yet (probably leftover data from the crypto negotiation) and if that happens ssl // sent yet (probably leftover data from the crypto negotiation) and if that happens ssl
// is liable to block forever hogging the connection and not letting it send... // is liable to block forever hogging the connection and not letting it send...
if(request.state == State.connecting)
if(writeSet.isSet(sock) || readSet.isSet(sock)) {
int error;
int retopt = sock.getOption(SocketOptionLevel.SOCKET, SocketOption.ERROR, error);
if(retopt < 0 || error != 0) {
request.state = State.aborted;
request.responseData.code = 2;
try {
request.responseData.codeText = "connection failed - " ~ formatSocketError(error);
} catch(Exception e) {
request.responseData.codeText = "connection failed";
}
inactive[inactiveCount++] = sock;
sock.close();
loseSocket(request.requestParameters.host, request.requestParameters.port, request.requestParameters.ssl, sock);
continue;
} else {
request.state = State.sendingHeaders;
if(auto s = cast(SslClientSocket) sock) {
try {
s.do_ssl_connect();
} catch(Exception e) {
request.state = State.aborted;
request.responseData.code = 2;
request.responseData.codeText = e.msg;
inactive[inactiveCount++] = sock;
sock.close();
loseSocket(request.requestParameters.host, request.requestParameters.port, request.requestParameters.ssl, sock);
}
continue;
}
}
}
if(request.state == State.sendingHeaders || request.state == State.sendingBody) if(request.state == State.sendingHeaders || request.state == State.sendingBody)
if(writeSet.isSet(sock)) { if(writeSet.isSet(sock)) {
request.timeoutFromInactivity = MonoTime.currTime + request.requestParameters.timeoutFromInactivity; request.timeoutFromInactivity = MonoTime.currTime + request.requestParameters.timeoutFromInactivity;
@ -3647,7 +3693,8 @@ version(use_openssl) {
@trusted @trusted
override void connect(Address to) { override void connect(Address to) {
super.connect(to); super.connect(to);
do_ssl_connect(); if(!blocking)
do_ssl_connect();
} }
@trusted @trusted