Merge branch 'master' into aes

Author: agentzh

lib/resty/string.lua

@@ -11,6 +11,8 @@ ffi.cdef[[
 typedef unsigned char u_char;
 
 u_char * ngx_hex_dump(u_char *dst, const u_char *src, size_t len);
+
+intptr_t ngx_atoi(const unsigned char *line, size_t n);
 ]]
 
 local str_type = ffi.typeof("uint8_t[?]")
@@ -24,6 +26,11 @@ function to_hex(s)
 end
 
 
+function atoi(s)
+ return tonumber(C.ngx_atoi(s, #s))
+end
+
+
 -- to prevent use of casual module global variables
 getmetatable(resty.string).__newindex = function (table, key, val)
  error('attempt to write to undeclared variable "' .. key .. '": '

valgrind.suppress

@@ -1,3 +1,9 @@
+{
+ <insert_a_suppression_name_here>
+ Memcheck:Cond
+ fun:lj_str_new
+ obj:*
+}
 {
  <insert_a_suppression_name_here>
  Memcheck:Param