diff -Nru lua-nginx-redis-0.26/debian/changelog lua-nginx-redis-0.27~rc1/debian/changelog --- lua-nginx-redis-0.26/debian/changelog 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/changelog 2019-02-08 16:12:35.000000000 +0000 @@ -1,34 +1,12 @@ -lua-nginx-redis (0.26-1) unstable; urgency=medium +lua-nginx-redis (0.27~rc1-1) unstable; urgency=medium * New upstream release. + * Refreshed package standards: + - Updated watchfile + - Bump up standard versions. + - Updated copyrights format. - -- Christos Trochalakis Fri, 18 Nov 2016 14:50:03 +0200 - -lua-nginx-redis (0.24-1) unstable; urgency=medium - - [ Christos Trochalakis ] - * New upstream version. - * Add a simple autopkgtest. - * Use BSD-2-clause short name in debian/copyright. - * Update debian/* copyrights. - * Bump Standards-Version to 3.9.8 (no changes needed). - * Use github.com in debian/watch, githubredir is deprecated. - - -- Christos Trochalakis Fri, 29 Jul 2016 14:35:08 +0300 - -lua-nginx-redis (0.20-1) unstable; urgency=medium - - [ Christos Trochalakis ] - * New upstream release. - * Move to debhelper 9. - * Bump Standards-Version to 3.9.5. - - [ Ulises Vitulli ] - * The 'It's-not-a-motocycle-Baby--Its-a-chopper' dupload. - * Adding pkg VCS headers. - * Adding Christos into Uploaders field. - - -- Ulises Vitulli Fri, 18 Apr 2014 11:18:27 -0300 + -- Ulises Vitulli Fri, 08 Feb 2019 13:12:35 -0300 lua-nginx-redis (0.15-1) unstable; urgency=low diff -Nru lua-nginx-redis-0.26/debian/changelog.upstream lua-nginx-redis-0.27~rc1/debian/changelog.upstream --- lua-nginx-redis-0.26/debian/changelog.upstream 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/changelog.upstream 2019-02-08 16:12:35.000000000 +0000 @@ -1,3 +1,294 @@ +commit 0b22d5ae37a62b45b1ab3406ac111cd71e825c41 +Author: Yichun Zhang (agentzh) +Date: Mon Oct 29 14:22:51 2018 -0700 + + bumped version to 0.27. + +commit 41827e454126d8a030b9e09fbf7e3a9f3afb8088 +Author: Yichun Zhang (agentzh) +Date: Fri Jun 8 17:51:36 2018 -0700 + + optimize: fixed misuses of Lua global variables in our Lua code (caught by the new version of the lj-releng tool). + +commit 03c092a0edb6e7d2a9519ea6f29e7a0ba7346142 +Author: Yichun Zhang (agentzh) +Date: Fri Oct 27 13:53:17 2017 -0700 + + tests: added new valgrind false positives in the latest nginx core. + +commit 9b8ca20018eac82f1e85697c8726f86d359bd038 +Author: Yichun Zhang (agentzh) +Date: Fri Oct 27 13:13:27 2017 -0700 + + tests: valgrind.suppress: removed too aggressive suppressions in nginx mem pools and luajit lj_str_new. + +commit 6699768b4836fee33df12a95650a14ce9b56c646 +Author: Yichun Zhang (agentzh) +Date: Fri Oct 27 12:02:15 2017 -0700 + + tests: minor tweaks in valgrind.suppress. + +commit 801dc8bfaada9260fadc864c10875560f00332ff +Author: vacuum-car +Date: Tue Sep 19 16:08:15 2017 +0900 + + bugfix: error message: typo fix: Unkown => Unknown + + Signed-off-by: Yichun Zhang (agentzh) + +commit b18966e4a079d391bea7d3fb715782cb33e2e29b +Author: Yichun Zhang (agentzh) +Date: Tue Dec 27 10:48:24 2016 -0800 + + tests: added a passing test for the connection refused error case (#106). + +commit bd06e7240c9b6dbfc2dc95af6783e38635267d78 +Author: Yichun Zhang (agentzh) +Date: Sun Dec 18 14:39:52 2016 -0800 + + doc: updated copyright notice. + +commit d1dc2f847f97816ed3b57bb116362c0d41f2f1f1 +Author: Yichun Zhang (agentzh) +Date: Sun Dec 18 14:37:39 2016 -0800 + + doc: updated copyright notice. + +commit 403d2982ec1dacaa758301c788754a82c82b00d8 +Author: Yichun Zhang (agentzh) +Date: Fri Nov 4 13:57:34 2016 -0700 + + upgraded lua-resty-redis to 0.26. + +commit f35bb7cd18414337c4d47479c4c4a3f1a345e8e6 +Author: spacewander +Date: Fri Oct 14 17:31:40 2016 +0800 + + use `select` to avoid temporal variable and be more luajit-friendly. + +commit 05858d93e12d3132d87cb41abfa9e1c3a7da3a6e +Author: Yichun Zhang (agentzh) +Date: Wed Sep 28 20:21:36 2016 -0700 + + checked in file dist.ini for OPM packaging. + +commit 886e95e2296c167cbddf8cc5ae96f556e0784ec4 +Author: Yichun Zhang (agentzh) +Date: Sun Sep 11 21:13:56 2016 -0700 + + added a (passing) test case for keys with underscores. + +commit e894abec0fa50416ff888c301fcca76fdcb31685 +Author: Yichun Zhang (agentzh) +Date: Mon Aug 15 14:51:45 2016 -0700 + + travis-ci: removed the env LUA_CMODULE_DIR=/lib which caused problems. + +commit 486ac295c27afcc827bca3697dcfa0aaa011578f +Author: Yichun Zhang (agentzh) +Date: Mon Aug 15 14:43:54 2016 -0700 + + doc: use *_by_lua_block {} in the code sample. + +commit 0f3653f8e7bbedb47ab7d80c9abbe67d1cbe0cfb +Author: Yichun Zhang (agentzh) +Date: Mon Aug 15 14:35:38 2016 -0700 + + bumped version to 0.25. + +commit e58b2db58acf4456ae43d854896f7db0c7525ada +Author: Yichun Zhang (agentzh) +Date: Mon Aug 15 14:26:50 2016 -0700 + + doc: fixed links pointing to wiki.nginx.org. + +commit 09bdcd6d79e1d8f8b4665b54839adf58d380ad65 +Author: spacewander +Date: Wed May 25 22:29:47 2016 +0800 + + feature: now this module automatically generate Lua methods for *any* Redis commands the caller attempts to use. + + The lazily generated Lua methods are cached in the Lua module table for + faster subsequent uses. + + In theory, any Redis commands in existing Redis or even future Redis + servers can work out of the box. + + Signed-off-by: Yichun Zhang (agentzh) + +commit a9ca41c2c022ad60f9b524b48bf65287a207112b +Author: Yichun Zhang (agentzh) +Date: Wed May 25 19:43:46 2016 -0700 + + bumped version to 0.24. + +commit 83a65c3bd1cef02d7d532320683b1c5549143847 +Author: alvin +Date: Thu May 19 17:55:48 2016 +0800 + + bugfix: added tostring() calls to avoid the "attempt to concatenate local 'prefix' (a nil value)" error in _read_reply(). + + Signed-off-by: Yichun Zhang (agentzh) + +commit ce5fc5b8e16c8a8c0cc41f3941aa21a7d4aef4f9 +Author: Ilya Shipitsin +Date: Wed May 25 00:55:03 2016 +0500 + + feature: added initial travis ci support. + + Signed-off-by: Yichun Zhang (agentzh) + +commit 062f20817d2052d233f14cd2b67aac7ccfae0e70 +Author: doujiang24 +Date: Fri Mar 18 15:30:26 2016 +0800 + + optimize: we now alway call tostring() upon args in redis query methods. + + also reduced Lua string concatenations in redis query composition. + + Signed-off-by: Yichun Zhang (agentzh) + +commit 7a19cf90522ee970cba63571ff0d0586300afdb8 +Merge: 3c3bcf4 e2aaa64 +Author: Yichun Zhang +Date: Wed Feb 3 09:39:33 2016 -0800 + + Merge pull request #76 from bhanuvrat/patch-1 + + correct a typo + +commit e2aaa64c1f5cf6bdf1607ba162078eca17e218b7 +Author: Anuvrat Parashar +Date: Wed Feb 3 13:35:11 2016 +0530 + + correct a typo + +commit 3c3bcf41693b455ccb79dde553de439d1112c350 +Merge: 6aa459b 3a6087f +Author: Yichun Zhang (agentzh) +Date: Mon Jan 25 15:21:19 2016 -0800 + + Merge branch 'master' of github.com:openresty/lua-resty-redis + +commit 6aa459b11dc4d89e6e36c8af869ad85d23b2bfae +Author: Yichun Zhang (agentzh) +Date: Mon Jan 25 15:21:13 2016 -0800 + + doc: various updates. + +commit 3a6087f83a058520701c7ffa6fa5f6cd1781dd00 +Merge: 662b0d4 21ee59c +Author: Yichun Zhang +Date: Thu Dec 24 11:02:24 2015 -0800 + + Merge pull request #74 from moonbingbing/master + + Remove the final semicolon, keep the code style + +commit 21ee59c73a7e449b194262ca498fb9655a4c5522 +Author: WenMing +Date: Thu Dec 24 15:13:40 2015 +0800 + + Remove the final semicolon, keep the code style + +commit 662b0d4c3ca2f49ed60f583354be5c698741b2bc +Author: Yichun Zhang (agentzh) +Date: Wed Dec 23 13:37:04 2015 -0800 + + fixed Makefile to allow relative paths in LUA_LIB_DIR when DESTDIR is not specified. + +commit 65fa7af6e894906a2792a7a53f09d66cfab326fb +Author: Yichun Zhang (agentzh) +Date: Tue Dec 22 20:56:53 2015 -0800 + + optimize: moved string concatenation for the redis request construction onto the C land. thanks Dejiang Zhu for the patch in #73. + +commit afa1c1c69673b81a1d479a9e8372e16fa00366a6 +Merge: 5e8c14a c8f8de9 +Author: Yichun Zhang +Date: Sat Nov 28 22:14:39 2015 +0800 + + Merge pull request #71 from bungle/master + + Commented out unused error from locals, added type and tostring to locals + +commit c8f8de9a37f1fdca7ea69cb2ce9c746443af3a5e +Author: Aapo Talvensaari +Date: Fri Nov 27 16:20:47 2015 +0200 + + Commented out unused error from locals, added type and tostring to locals. + +commit 5e8c14a92becde93c94f447b205f2f1d21e5bc3d +Author: Yichun Zhang (agentzh) +Date: Mon Nov 23 23:18:37 2015 +0800 + + added a .gitattributes file to correct GitHub's language tag. + +commit 748ba8daf02568a7f09f40efc6436d1742a94cae +Author: Yichun Zhang (agentzh) +Date: Wed Oct 28 16:31:42 2015 +0800 + + doc: updated the copyright years. + +commit 7bdb2e96c60209d02d8cde54b2b8766aa8a948fd +Author: doujiang24 +Date: Tue Jul 21 11:41:28 2015 +0800 + + doc: check redis pipelined requests' return values more strictly. + + some commands (like hkeys and smembers) may return empty tables, + which may result in nil res[1] values. + + thanks Dejiang Zhu for the patch in #62. + +commit 688f932514033276462c2b97f2d7cf9db967d462 +Author: Yichun Zhang (agentzh) +Date: Wed Oct 29 20:11:31 2014 -0700 + + bugfix: the "attempt to call local new_tab (a table value)" error might happen when LuaJIT 2.0 was used and a local Lua module named "table.new" was visible. thanks Michael Pirogov for the report in #51. + +commit c49ba7c3b21705b62c98abb670d5f9f9f6b1ff09 +Author: Yichun Zhang (agentzh) +Date: Sun May 11 20:07:36 2014 -0700 + + doc: mentioned the "bad request" error in the "Limitations" section. + +commit 4f41f9feaa64eb5114454b64941a3c9cd2faedbc +Author: Yichun Zhang (agentzh) +Date: Tue Apr 15 13:19:43 2014 -0700 + + doc: mentioned the maxclients redis parameter too. + +commit a78cf3c4d530ca48fb0b5f9b614f34f9e57a5419 +Author: Yichun Zhang (agentzh) +Date: Tue Apr 15 13:14:58 2014 -0700 + + doc: added a new section "Check List for Issues". + +commit 3051f57ca528c9d44e673101abad0f8f28609ba7 +Author: Yichun Zhang (agentzh) +Date: Tue Apr 8 22:06:15 2014 -0700 + + tested the select() command also. + +commit ddd244e9d9fcd27ce48c45fabc3e8de72b7963e1 +Author: Yichun Zhang (agentzh) +Date: Sat Apr 5 10:51:18 2014 -0700 + + fixed a test case for redis 2.8.x. + +commit d062df24ebe6fc5579b5b08c589f2332b9ef643b +Author: Yichun Zhang (agentzh) +Date: Tue Apr 1 14:48:54 2014 -0700 + + suppressed a false positive in libdl. + +commit 1dc183d1bb4043a1513864dd0a8f1b1c6d498f6c +Author: Yichun Zhang (agentzh) +Date: Wed Mar 12 15:56:33 2014 -0700 + + removed the years from the in-source copyright. + commit dd0a8c64921e54c53b2c6dc22d7670c896b8544d Author: Yichun Zhang (agentzh) Date: Wed Mar 12 15:55:18 2014 -0700 diff -Nru lua-nginx-redis-0.26/debian/compat lua-nginx-redis-0.27~rc1/debian/compat --- lua-nginx-redis-0.26/debian/compat 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/compat 2019-02-08 16:12:35.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru lua-nginx-redis-0.26/debian/control lua-nginx-redis-0.27~rc1/debian/control --- lua-nginx-redis-0.26/debian/control 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/control 2019-02-08 16:12:35.000000000 +0000 @@ -2,12 +2,9 @@ Section: interpreters Priority: optional Maintainer: Ulises Vitulli -Uploaders: Christos Trochalakis -Build-Depends: debhelper (>= 9), dh-lua -Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 11), dh-lua +Standards-Version: 4.3.0.1 Homepage: https://github.com/agentzh/lua-resty-redis -Vcs-Git: https://anonscm.debian.org/git/collab-maint/lua-nginx-redis.git -Vcs-Browser: https://anonscm.debian.org/git/collab-maint/lua-nginx-redis.git Package: lua-nginx-redis Architecture: all @@ -22,6 +19,6 @@ developers making use of the Lua programming language to script and construct extremely high-performance web applications capable to handle 10K+ connections. - . + . Note that this module works for both nginx (provided by nginx-extras) and the OpenResty bundle. diff -Nru lua-nginx-redis-0.26/debian/copyright lua-nginx-redis-0.27~rc1/debian/copyright --- lua-nginx-redis-0.26/debian/copyright 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/copyright 2019-02-08 16:12:35.000000000 +0000 @@ -1,12 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: lua-resty-redis +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lua-resty-redis Upstream-Contact: Yichun "agentzh" Zhang (章亦春) Source: https://github.com/agentzh/lua-resty-redis Files: * -Copyright: 2012, by Yichun "agentzh" Zhang (章亦春) . -License: BSD-2-clause - +Copyright: 2012, by Yichun "agentzh" Zhang (章亦春) . License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -29,10 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: (C) 2012-2016 Ulises Vitulli - (C) 2014-2016 Christos Trochalakis -License: GPL-3 - +Copyright: (C) 2012 Ulises Vitulli License: GPL-3 This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru lua-nginx-redis-0.26/debian/gbp.conf lua-nginx-redis-0.27~rc1/debian/gbp.conf --- lua-nginx-redis-0.26/debian/gbp.conf 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[DEFAULT] -pristine-tar = True diff -Nru lua-nginx-redis-0.26/debian/rules lua-nginx-redis-0.27~rc1/debian/rules --- lua-nginx-redis-0.26/debian/rules 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/rules 2019-02-08 16:12:35.000000000 +0000 @@ -5,4 +5,3 @@ override_dh_installchangelogs: dh_installchangelogs debian/changelog.upstream - diff -Nru lua-nginx-redis-0.26/debian/tests/control lua-nginx-redis-0.27~rc1/debian/tests/control --- lua-nginx-redis-0.26/debian/tests/control 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Tests: general -Restrictions: allow-stderr isolation-container, needs-root -Depends: lua-nginx-redis, nginx-extras, redis-server, curl diff -Nru lua-nginx-redis-0.26/debian/tests/general lua-nginx-redis-0.27~rc1/debian/tests/general --- lua-nginx-redis-0.26/debian/tests/general 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/tests/general 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash - -set -e -set -x - -rm /etc/nginx/sites-enabled/default -cat </etc/nginx/sites-enabled/lua -lua_package_path "/usr/share/lua/5.1/nginx/?.lua;;"; - -server { - listen 80; - - location / { - content_by_lua ' - local redis = require "redis" - local red = redis:new() - - local ok, err = red:connect("127.0.0.1", 6379) - if not ok then - ngx.say("failed to connect: ", err) - return - end - - ok, err = red:set("distro", "Debian") - if not ok then - ngx.say("failed to set: ", err) - return - end - - ngx.say("OK") - '; - } -} -EOF - -systemctl restart nginx -sleep 1 - -[ "$(curl -s localhost)" == "OK" ] diff -Nru lua-nginx-redis-0.26/debian/watch lua-nginx-redis-0.27~rc1/debian/watch --- lua-nginx-redis-0.26/debian/watch 2016-11-18 12:50:03.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/debian/watch 2019-02-08 16:12:35.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -https://github.com/agentzh/lua-resty-redis/tags .*/v(.*)\.tar\.gz +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/-$1\.tar\.gz/ \ + https://github.com/agentzh/lua-resty-redis/tags .*/v?(\d\S+)\.tar\.gz diff -Nru lua-nginx-redis-0.26/lib/resty/redis.lua lua-nginx-redis-0.27~rc1/lib/resty/redis.lua --- lua-nginx-redis-0.26/lib/resty/redis.lua 2016-11-04 20:57:34.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/lib/resty/redis.lua 2018-10-29 21:22:51.000000000 +0000 @@ -12,6 +12,7 @@ local tonumber = tonumber local tostring = tostring local rawget = rawget +local select = select --local error = error @@ -23,7 +24,7 @@ local _M = new_tab(0, 54) -_M._VERSION = '0.26' +_M._VERSION = '0.27' local common_cmds = { @@ -199,7 +200,7 @@ else -- when `line` is an empty string, `prefix` will be equal to nil. - return nil, "unkown prefix: \"" .. tostring(prefix) .. "\"" + return nil, "unknown prefix: \"" .. tostring(prefix) .. "\"" end end diff -Nru lua-nginx-redis-0.26/README.markdown lua-nginx-redis-0.27~rc1/README.markdown --- lua-nginx-redis-0.26/README.markdown 2016-11-04 20:57:34.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/README.markdown 2018-10-29 21:22:51.000000000 +0000 @@ -665,7 +665,7 @@ Author ====== -Yichun "agentzh" Zhang (章亦春) , CloudFlare Inc. +Yichun "agentzh" Zhang (章亦春) , OpenResty Inc. [Back to TOC](#table-of-contents) @@ -674,7 +674,7 @@ This module is licensed under the BSD license. -Copyright (C) 2012-2016, by Yichun Zhang (agentzh) , CloudFlare Inc. +Copyright (C) 2012-2017, by Yichun Zhang (agentzh) , OpenResty Inc. All rights reserved. diff -Nru lua-nginx-redis-0.26/t/sanity.t lua-nginx-redis-0.27~rc1/t/sanity.t --- lua-nginx-redis-0.26/t/sanity.t 2016-11-04 20:57:34.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/t/sanity.t 2018-10-29 21:22:51.000000000 +0000 @@ -827,3 +827,34 @@ a_dog: an animal --- no_error_log [error] + + + +=== TEST 15: connection refused +--- http_config eval: $::HttpConfig +--- config + location /t { + content_by_lua ' + local redis = require "resty.redis" + local red = redis:new() + + red:set_timeout(10000) -- 10 sec + + local ok, err = red:connect("127.0.0.1", 81) + if not ok then + ngx.say("failed to connect: ", err) + return + end + + ngx.say("connected") + + red:close() + '; + } +--- request +GET /t +--- response_body +failed to connect: connection refused +--- timeout: 3 +--- no_error_log +[alert] diff -Nru lua-nginx-redis-0.26/valgrind.suppress lua-nginx-redis-0.27~rc1/valgrind.suppress --- lua-nginx-redis-0.26/valgrind.suppress 2016-11-04 20:57:34.000000000 +0000 +++ lua-nginx-redis-0.27~rc1/valgrind.suppress 2018-10-29 21:22:51.000000000 +0000 @@ -89,21 +89,6 @@ } { - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_malloc - fun:ngx_pcalloc -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:(below main) -} -{ - Memcheck:Param epoll_ctl(event) fun:epoll_ctl @@ -131,14 +116,6 @@ } { - Memcheck:Leak - fun:memalign - fun:posix_memalign - fun:ngx_memalign - fun:ngx_pcalloc -} -{ - Memcheck:Param socketcall.setsockopt(optval) fun:setsockopt @@ -149,76 +126,15 @@ Memcheck:Leak fun:malloc fun:ngx_alloc - fun:ngx_palloc_large -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc fun:ngx_pool_cleanup_add } { - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_pnalloc -} -{ - Memcheck:Cond fun:ngx_conf_flush_files fun:ngx_single_process_cycle fun:main } - -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_palloc -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_pcalloc -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_malloc - fun:ngx_palloc_large -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_create_pool -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_malloc - fun:ngx_palloc -} -{ - - Memcheck:Leak - fun:malloc - fun:ngx_alloc - fun:ngx_malloc - fun:ngx_pnalloc -} - { Memcheck:Leak @@ -235,7 +151,6 @@ fun:ngx_init_cycle fun:main } - { Memcheck:Leak @@ -432,23 +347,6 @@ } { - Memcheck:Leak - fun:memalign - fun:posix_memalign - fun:ngx_memalign - fun:ngx_create_pool -} -{ - - Memcheck:Leak - fun:memalign - fun:posix_memalign - fun:ngx_memalign - fun:ngx_palloc_block - fun:ngx_palloc -} -{ - Memcheck:Cond fun:index fun:expand_dynamic_string_token @@ -460,3 +358,22 @@ fun:_dl_sysdep_start fun:_dl_start } +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:ngx_alloc + fun:ngx_set_environment + fun:ngx_single_process_cycle +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:ngx_alloc + fun:ngx_set_environment + fun:ngx_worker_process_init + fun:ngx_worker_process_cycle +}