merge fixes

alonbg · alonbg · commit 182900414a3e · 2016-09-18T11:07:01.000+03:00
diff --git a/src/ngx_stream_lua_socket_tcp.c b/src/ngx_stream_lua_socket_tcp.c
@@ -293,7 +293,7 @@ ngx_stream_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{tcp object metatable */
-    lua_pushlightuserdata(L, &ngx_stream_lua_skcoet_tcp_metatable_key);
+    lua_pushlightuserdata(L, &ngx_stream_lua_socket_tcp_metatable_key);
     lua_createtable(L, 0 /* narr */, 12 /* nrec */);
 
     lua_pushcfunction(L, ngx_stream_lua_socket_tcp_bind);
diff --git a/t/062-count.t b/t/062-count.t
@@ -249,7 +249,7 @@ worker: 4
         ngx.say("n = ", n)
     }
 --- stream_response
-n = 7
+n = 8
 --- no_error_log
 [error]
 
diff --git a/t/137-udp-count.t b/t/137-udp-count.t
@@ -40,7 +40,7 @@ __DATA__
     }
 
 --- dgram_response chomp
-n = 6
+n = 8
 --- no_error_log
 [error]
 
