Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make HTTPClientResponse.this nothrow #2760

Merged
merged 1 commit into from
Jan 12, 2024
+17 −9
Merged

Make HTTPClientResponse.this nothrow #2760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions http/vibe/http/client.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,9 +509,11 @@ final class HTTPClient {
m_responding = true;

static if (is(T == HTTPClientResponse))
res = new HTTPClientResponse(this, has_body, close_conn, request_allocator, connected_time);
res = new HTTPClientResponse(this, close_conn);
else
res = scoped!HTTPClientResponse(this, has_body, close_conn, request_allocator, connected_time);
res = scoped!HTTPClientResponse(this, close_conn);

res.initialize(has_body, request_allocator, connected_time);

if (res.headers.get("Proxy-Authenticate", null) !is null){
res.dropBody();
Expand Down Expand Up @@ -556,7 +558,8 @@ final class HTTPClient {
bool has_body = doRequestWithRetry(requester, false, close_conn, connected_time);

m_responding = true;
auto res = scoped!HTTPClientResponse(this, has_body, close_conn, request_allocator, connected_time);
auto res = scoped!HTTPClientResponse(this, close_conn);
res.initialize(has_body, request_allocator, connected_time);

// proxy implementation
if (res.headers.get("Proxy-Authenticate", null) !is null) {
Expand All @@ -575,7 +578,8 @@ final class HTTPClient {
// just an informational status -> read and handle next response
if (m_responding) res.dropBody();
if (m_conn) {
res = scoped!HTTPClientResponse(this, has_body, close_conn, request_allocator, connected_time);
res = scoped!HTTPClientResponse(this, close_conn);
res.initialize(has_body, request_allocator, connected_time);
continue;
}
}
Expand Down Expand Up @@ -603,7 +607,8 @@ final class HTTPClient {
}
bool has_body = doRequestWithRetry(requester, false, close_conn, connected_time);
m_responding = true;
auto res = new HTTPClientResponse(this, has_body, close_conn, () @trusted { return vibeThreadAllocator(); } (), connected_time);
auto res = new HTTPClientResponse(this, close_conn);
res.initialize(has_body, () @trusted { return vibeThreadAllocator(); } (), connected_time);

// proxy implementation
if (res.headers.get("Proxy-Authenticate", null) !is null) {
Expand Down Expand Up @@ -1017,16 +1022,19 @@ final class HTTPClientResponse : HTTPResponse {
}

/// private
this(HTTPClient client, bool has_body, bool close_conn, IAllocator alloc, SysTime connected_time = Clock.currTime(UTC()))
{
this(HTTPClient client, bool close_conn)
nothrow {
m_client = client;
m_closeConn = close_conn;
}

private void initialize(bool has_body, IAllocator alloc, SysTime connected_time = Clock.currTime(UTC()))
{
scope(failure) finalize(true);

// read and parse status line ("HTTP/#.# #[ $]\r\n")
logTrace("HTTP client reading status line");
string stln = () @trusted { return cast(string)client.m_stream.readLine(HTTPClient.maxHeaderLineLength, "\r\n", alloc); } ();
string stln = () @trusted { return cast(string)m_client.m_stream.readLine(HTTPClient.maxHeaderLineLength, "\r\n", alloc); } ();
logTrace("stln: %s", stln);
this.httpVersion = parseHTTPVersion(stln);

Expand All @@ -1040,7 +1048,7 @@ final class HTTPClientResponse : HTTPResponse {
}

// read headers until an empty line is hit
parseRFC5322Header(client.m_stream, this.headers, HTTPClient.maxHeaderLineLength, alloc, false);
parseRFC5322Header(m_client.m_stream, this.headers, HTTPClient.maxHeaderLineLength, alloc, false);

logTrace("---------------------");
logTrace("HTTP client response:");
Expand Down
Loading