Skip to content

Commit 088ab19

Browse files
committed
bugfix: segmentation fault might happen in ngx_destroy_pool when debug logging was enabled in the nginx build. thanks buddy-ekb for the report in FRiCKLE#21.
1 parent 0e5ce4a commit 088ab19

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Diff for: src/ngx_postgres_keepalive.c

+9
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ ngx_postgres_keepalive_get_peer_single(ngx_peer_connection_t *pc,
8585

8686
c->idle = 0;
8787
c->log = pc->log;
88+
#if defined(nginx_version) && (nginx_version >= 1001004)
89+
c->pool->log = pc->log;
90+
#endif
8891
c->read->log = pc->log;
8992
c->write->log = pc->log;
9093

@@ -140,6 +143,9 @@ ngx_postgres_keepalive_get_peer_multi(ngx_peer_connection_t *pc,
140143

141144
c->idle = 0;
142145
c->log = pc->log;
146+
#if defined(nginx_version) && (nginx_version >= 1001004)
147+
c->pool->log = pc->log;
148+
#endif
143149
c->read->log = pc->log;
144150
c->write->log = pc->log;
145151

@@ -235,6 +241,9 @@ ngx_postgres_keepalive_free_peer(ngx_peer_connection_t *pc,
235241
c->data = item;
236242
c->idle = 1;
237243
c->log = ngx_cycle->log;
244+
#if defined(nginx_version) && (nginx_version >= 1001004)
245+
c->pool->log = ngx_cycle->log;
246+
#endif
238247
c->read->log = ngx_cycle->log;
239248
c->write->log = ngx_cycle->log;
240249

0 commit comments

Comments
 (0)