Skip to content

Commit 1e69f37

Browse files
cosmo0920edsiper
authored andcommitted
http_client: Restore behavior for dummy http client
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
1 parent 230eb3c commit 1e69f37

1 file changed

Lines changed: 19 additions & 10 deletions

File tree

src/flb_http_client.c

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,17 +1016,26 @@ struct flb_http_client *create_http_client(struct flb_connection *u_conn,
10161016
return NULL;
10171017
}
10181018

1019-
c->u_conn = u_conn;
1020-
c->original_net_setup = u_conn->net;
1021-
if (u_conn->net != NULL) {
1022-
c->request_net_setup = *u_conn->net;
1023-
}
1024-
else if (u_conn->upstream != NULL) {
1025-
c->request_net_setup = u_conn->upstream->base.net;
1026-
c->original_net_setup = &u_conn->upstream->base.net;
1019+
c->u_conn = u_conn;
1020+
if (u_conn) {
1021+
c->original_net_setup = u_conn->net;
1022+
1023+
if (u_conn->net != NULL) {
1024+
c->request_net_setup = *u_conn->net;
1025+
}
1026+
else if (u_conn->upstream != NULL) {
1027+
c->request_net_setup = u_conn->upstream->base.net;
1028+
c->original_net_setup = &u_conn->upstream->base.net;
1029+
}
1030+
1031+
if (c->original_net_setup != NULL) {
1032+
c->u_conn->net = &c->request_net_setup;
1033+
}
10271034
}
1028-
if (c->original_net_setup != NULL) {
1029-
c->u_conn->net = &c->request_net_setup;
1035+
else {
1036+
/* For dummy client */
1037+
c->original_net_setup = NULL;
1038+
memset(&c->request_net_setup, 0, sizeof(c->request_net_setup));
10301039
}
10311040
c->method = method;
10321041
c->uri = uri;

0 commit comments

Comments
 (0)