Skip to content

Commit 26cb706

Browse files
committed
fcgi/Client: convert pool pointer to reference
1 parent c0080e8 commit 26cb706

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/fcgi/Client.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ FcgiClient::FcgiClient(struct pool &_pool,
13151315
}
13161316

13171317
void
1318-
fcgi_client_request(struct pool *pool,
1318+
fcgi_client_request(struct pool &pool,
13191319
StopwatchPtr stopwatch,
13201320
BufferedSocket &socket, Lease &lease,
13211321
HttpMethod method, const char *uri,
@@ -1407,20 +1407,20 @@ fcgi_client_request(struct pool *pool,
14071407

14081408
if (body)
14091409
/* format the request body */
1410-
request = NewConcatIstream(*pool,
1411-
istream_gb_new(*pool, std::move(buffer)),
1412-
istream_fcgi_new(*pool, std::move(body),
1410+
request = NewConcatIstream(pool,
1411+
istream_gb_new(pool, std::move(buffer)),
1412+
istream_fcgi_new(pool, std::move(body),
14131413
header.request_id));
14141414
else {
14151415
/* no request body - append an empty STDIN packet */
14161416
header.type = FcgiRecordType::STDIN;
14171417
header.content_length = 0;
14181418
buffer.WriteT(header);
14191419

1420-
request = istream_gb_new(*pool, std::move(buffer));
1420+
request = istream_gb_new(pool, std::move(buffer));
14211421
}
14221422

1423-
auto client = NewFromPool<FcgiClient>(*pool, *pool,
1423+
auto client = NewFromPool<FcgiClient>(pool, pool,
14241424
std::move(stopwatch),
14251425
socket, lease,
14261426
std::move(stderr_fd),

src/fcgi/Client.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ IsFcgiClientRetryFailure(const std::exception_ptr &error) noexcept;
5050
* @param async_ref a handle which may be used to abort the operation
5151
*/
5252
void
53-
fcgi_client_request(struct pool *pool,
53+
fcgi_client_request(struct pool &pool,
5454
StopwatchPtr stopwatch,
5555
BufferedSocket &socket, Lease &lease,
5656
HttpMethod method, const char *uri,

src/fcgi/Remote.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ FcgiRemoteRequest::OnStockItemReady(StockItem &item) noexcept
127127
stock_item = &item;
128128
cancel_ptr = {};
129129

130-
fcgi_client_request(&pool, std::move(stopwatch),
130+
fcgi_client_request(pool, std::move(stopwatch),
131131
tcp_stock_item_get(item),
132132
*this,
133133
pending_request.method, pending_request.uri,

src/fcgi/Request.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ FcgiRequest::OnStockItemReady(StockItem &item) noexcept
171171

172172
const char *script_filename = address.path;
173173

174-
fcgi_client_request(&pool, std::move(stopwatch),
174+
fcgi_client_request(pool, std::move(stopwatch),
175175
fcgi_stock_item_get(*stock_item),
176176
*this,
177177
pending_request.method, pending_request.uri,

test/t_fcgi_client.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ class FcgiClientConnection final : public ClientConnection {
255255
[[maybe_unused]] bool expect_100,
256256
HttpResponseHandler &handler,
257257
CancellablePointer &cancel_ptr) noexcept override {
258-
fcgi_client_request(&pool, nullptr,
258+
fcgi_client_request(pool, nullptr,
259259
socket, lease,
260260
method, uri, uri, nullptr, nullptr, nullptr,
261261
nullptr, "192.168.1.100",

0 commit comments

Comments
 (0)