Merge branch 'master' of https://github.com/FRiCKLE/ngx_postgres

Author: Andrey Alcheev

src/ngx_postgres_keepalive.c

@@ -85,6 +85,9 @@ ngx_postgres_keepalive_get_peer_single(ngx_peer_connection_t *pc,
 
         c->idle = 0;
         c->log = pc->log;
+#if defined(nginx_version) && (nginx_version >= 1001004)
+        c->pool->log = pc->log;
+#endif
         c->read->log = pc->log;
         c->write->log = pc->log;
 
@@ -140,6 +143,9 @@ ngx_postgres_keepalive_get_peer_multi(ngx_peer_connection_t *pc,
 
             c->idle = 0;
             c->log = pc->log;
+#if defined(nginx_version) && (nginx_version >= 1001004)
+            c->pool->log = pc->log;
+#endif
             c->read->log = pc->log;
             c->write->log = pc->log;
 
@@ -235,6 +241,9 @@ ngx_postgres_keepalive_free_peer(ngx_peer_connection_t *pc,
         c->data = item;
         c->idle = 1;
         c->log = ngx_cycle->log;
+#if defined(nginx_version) && (nginx_version >= 1001004)
+        c->pool->log = ngx_cycle->log;
+#endif
         c->read->log = ngx_cycle->log;
         c->write->log = ngx_cycle->log;
 

t/sanity.t

@@ -151,7 +151,6 @@ Content-Type: application/x-resty-dbd-stream
 --- no_error_log
 [alert]
 [error]
---- LAST
 
 
 

valgrind.suppress

@@ -318,4 +318,14 @@ fun:main
    fun:ngx_init_cycle
    fun:main
 }
-
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}