Skip to content

Commit 8146b42

Browse files
committed
http_client: fixed support of runtime tests
Signed-off-by: Marat Abrarov <abrarov@gmail.com>
1 parent 856d762 commit 8146b42

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

run_code_analysis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ FLB_CMAKE_OPTIONS=${FLB_CMAKE_OPTIONS:--DFLB_BACKTRACE=Off -DFLB_SHARED_LIB=Off
1414
ADDITIONAL_DEPS=${ADDITIONAL_DEPS:-libssl-dev libsasl2-dev pkg-config libsystemd-dev zlib1g-dev libpq-dev postgresql-server-dev-all flex bison libyaml-dev netcat}
1515

1616
# From the Unit Tests script
17-
SKIP_TESTS=${SKIP_TESTS:-flb-rt-out_elasticsearch flb-it-network flb-it-fstore flb-rt-out_elasticsearch flb-rt-out_td flb-rt-out_forward flb-rt-in_disk flb-rt-in_proc}
17+
SKIP_TESTS=${SKIP_TESTS:-flb-it-network flb-it-fstore flb-rt-out_td flb-rt-out_forward flb-rt-in_disk flb-rt-in_proc}
1818

1919
SKIP=""
2020
for skip in $SKIP_TESTS

src/flb_http_client.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,16 +1017,18 @@ struct flb_http_client *create_http_client(struct flb_connection *u_conn,
10171017
}
10181018

10191019
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;
1027-
}
1028-
if (c->original_net_setup != NULL) {
1029-
c->u_conn->net = &c->request_net_setup;
1020+
if (u_conn != NULL) {
1021+
c->original_net_setup = u_conn->net;
1022+
if (u_conn->net != NULL) {
1023+
c->request_net_setup = *u_conn->net;
1024+
}
1025+
else if (u_conn->upstream != NULL) {
1026+
c->request_net_setup = u_conn->upstream->base.net;
1027+
c->original_net_setup = &u_conn->upstream->base.net;
1028+
}
1029+
if (c->original_net_setup != NULL) {
1030+
c->u_conn->net = &c->request_net_setup;
1031+
}
10301032
}
10311033
c->method = method;
10321034
c->uri = uri;

0 commit comments

Comments
 (0)