Merge pull request #1 from openresty/master

syn

Author: membphis

src/ngx_http_lua_shdict.c

@@ -1013,7 +1013,7 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: found old entry bug value size "
+                       "lua shared dict set: found old entry but value size "
                        "NOT matched, removing it first");
 
 remove:
@@ -1522,7 +1522,7 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: found old entry bug value size "
+                       "lua shared dict set: found old entry but value size "
                        "NOT matched, removing it first");
 
 remove:

util/build.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-# this file is mostly meant to be used by the author himself.
+# this script is for developers only.
+# dependent on the ngx-build script from the nginx-devel-utils repostory:
+#   https://github.com/openresty/nginx-devel-utils/blob/master/ngx-build
+# the resulting nginx is located at ./work/nginx/sbin/nginx
 
 root=`pwd`
 version=${1:-1.4.1}

util/build2.sh

@@ -103,6 +103,13 @@ fun:main
    fun:ngx_alloc
    fun:ngx_event_process_init
 }
+{
+    <insert_a_suppression_name_here>
+    Memcheck:Param
+    sendmsg(mmsg[0].msg_hdr)
+    fun:sendmmsg
+    fun:__libc_res_nsend
+}
 {
    <insert_a_suppression_name_here>
    Memcheck:Param