From e68990083ebdfb43a11341fa2c203710b2422547 Mon Sep 17 00:00:00 2001
From: Cyril Lavier <cyril.lavier@davromaniak.eu>
Date: Wed, 12 Dec 2012 11:32:35 +0100
Subject: [PATCH] Updated nginx-lua with the 0.7.8 version.

---
 debian/modules/README.Modules-versions        |    2 +-
 debian/modules/nginx-lua/.gitignore           |  157 +
 debian/modules/nginx-lua/.gitmodules          |    3 +
 debian/modules/nginx-lua/README               | 2524 ++++++++++++-----
 debian/modules/nginx-lua/README.markdown      | 1795 +++++++++---
 debian/modules/nginx-lua/config               |  117 +-
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  | 1760 +++++++++---
 .../nginx-lua/dtrace/ngx_lua_provider.d       |   61 +
 .../nginx-lua/src/api/ngx_http_lua_api.h      |   23 +-
 .../nginx-lua/src/ngx_http_lua_accessby.c     |  102 +-
 .../modules/nginx-lua/src/ngx_http_lua_api.c  |   49 +-
 .../modules/nginx-lua/src/ngx_http_lua_args.c |    9 +-
 .../nginx-lua/src/ngx_http_lua_bodyfilterby.c |  627 ++++
 .../nginx-lua/src/ngx_http_lua_bodyfilterby.h |   31 +
 .../nginx-lua/src/ngx_http_lua_cache.c        |   19 +-
 .../src/ngx_http_lua_capturefilter.c          |   43 +-
 .../nginx-lua/src/ngx_http_lua_clfactory.c    |  646 ++++-
 .../nginx-lua/src/ngx_http_lua_common.h       |  260 +-
 .../modules/nginx-lua/src/ngx_http_lua_conf.c |  210 --
 .../modules/nginx-lua/src/ngx_http_lua_conf.h |   15 -
 .../nginx-lua/src/ngx_http_lua_contentby.c    |  189 +-
 .../nginx-lua/src/ngx_http_lua_control.c      |  179 +-
 .../nginx-lua/src/ngx_http_lua_coroutine.c    |  331 +++
 .../nginx-lua/src/ngx_http_lua_coroutine.h    |   17 +
 .../modules/nginx-lua/src/ngx_http_lua_ctx.c  |   19 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |  273 +-
 .../nginx-lua/src/ngx_http_lua_directive.h    |   27 +-
 .../nginx-lua/src/ngx_http_lua_exception.c    |   30 +-
 .../src/ngx_http_lua_headerfilterby.c         |  113 +-
 .../src/ngx_http_lua_headerfilterby.h         |    3 +
 .../nginx-lua/src/ngx_http_lua_headers.c      |  116 +-
 .../nginx-lua/src/ngx_http_lua_headers.h      |    2 +-
 .../nginx-lua/src/ngx_http_lua_headers_in.c   |  114 +-
 .../nginx-lua/src/ngx_http_lua_initby.c       |   81 +
 .../nginx-lua/src/ngx_http_lua_initby.h       |   16 +
 .../modules/nginx-lua/src/ngx_http_lua_log.c  |   60 +-
 .../nginx-lua/src/ngx_http_lua_logby.c        |  266 ++
 .../nginx-lua/src/ngx_http_lua_logby.h        |   18 +
 .../modules/nginx-lua/src/ngx_http_lua_misc.c |   13 +-
 .../nginx-lua/src/ngx_http_lua_module.c       |  424 ++-
 .../modules/nginx-lua/src/ngx_http_lua_ndk.c  |    4 +-
 .../nginx-lua/src/ngx_http_lua_output.c       |  183 +-
 .../nginx-lua/src/ngx_http_lua_output.h       |    7 +-
 .../nginx-lua/src/ngx_http_lua_phase.c        |   82 +
 .../nginx-lua/src/ngx_http_lua_phase.h        |   11 +
 .../nginx-lua/src/ngx_http_lua_probe.h        |   85 +
 .../nginx-lua/src/ngx_http_lua_regex.c        |  180 +-
 .../nginx-lua/src/ngx_http_lua_req_body.c     |  507 +++-
 .../nginx-lua/src/ngx_http_lua_req_method.c   |  108 +
 .../nginx-lua/src/ngx_http_lua_req_method.h   |   12 +
 .../nginx-lua/src/ngx_http_lua_rewriteby.c    |   93 +-
 .../nginx-lua/src/ngx_http_lua_script.c       |    2 +
 .../nginx-lua/src/ngx_http_lua_setby.c        |  208 +-
 .../nginx-lua/src/ngx_http_lua_setby.h        |    2 +
 .../nginx-lua/src/ngx_http_lua_shdict.c       |  389 ++-
 .../nginx-lua/src/ngx_http_lua_shdict.h       |    2 +
 .../nginx-lua/src/ngx_http_lua_sleep.c        |  181 ++
 .../nginx-lua/src/ngx_http_lua_sleep.h        |   11 +
 ...lua_socket.c => ngx_http_lua_socket_tcp.c} | 1309 ++++++---
 ...lua_socket.h => ngx_http_lua_socket_tcp.h} |   50 +-
 .../nginx-lua/src/ngx_http_lua_socket_udp.c   | 1486 ++++++++++
 .../nginx-lua/src/ngx_http_lua_socket_udp.h   |   49 +
 .../nginx-lua/src/ngx_http_lua_string.c       |   21 +-
 .../nginx-lua/src/ngx_http_lua_subrequest.c   |  527 +++-
 .../nginx-lua/src/ngx_http_lua_subrequest.h   |   17 +-
 .../modules/nginx-lua/src/ngx_http_lua_time.c |   31 +-
 .../modules/nginx-lua/src/ngx_http_lua_time.h |    2 +-
 .../modules/nginx-lua/src/ngx_http_lua_uri.c  |   74 +-
 .../nginx-lua/src/ngx_http_lua_uthread.c      |  184 ++
 .../nginx-lua/src/ngx_http_lua_uthread.h      |   29 +
 .../modules/nginx-lua/src/ngx_http_lua_util.c | 2274 ++++++++++-----
 .../modules/nginx-lua/src/ngx_http_lua_util.h |  118 +-
 .../nginx-lua/src/ngx_http_lua_variable.c     |    7 +-
 debian/modules/nginx-lua/t/.gitignore         |    2 +
 debian/modules/nginx-lua/t/001-set.t          |  493 +++-
 debian/modules/nginx-lua/t/002-content.t      |   24 +
 debian/modules/nginx-lua/t/005-exit.t         |   79 +-
 debian/modules/nginx-lua/t/009-log.t          |   55 +-
 debian/modules/nginx-lua/t/014-bugs.t         |  171 +-
 debian/modules/nginx-lua/t/015-status.t       |   24 +-
 debian/modules/nginx-lua/t/016-resp-header.t  |   44 +-
 debian/modules/nginx-lua/t/017-exec.t         |   36 +-
 debian/modules/nginx-lua/t/018-ndk.t          |   54 +-
 debian/modules/nginx-lua/t/020-subrequest.t   |  656 ++++-
 debian/modules/nginx-lua/t/022-redirect.t     |   25 +-
 .../nginx-lua/t/023-rewrite/client-abort.t    |  850 ++++++
 debian/modules/nginx-lua/t/023-rewrite/exit.t |   65 +-
 .../nginx-lua/t/023-rewrite/on-abort.t        |  663 +++++
 .../nginx-lua/t/023-rewrite/redirect.t        |    2 -
 .../nginx-lua/t/023-rewrite/req-body.t        |    2 +-
 .../nginx-lua/t/023-rewrite/req-socket.t      |  536 ++++
 .../modules/nginx-lua/t/023-rewrite/sleep.t   |  223 ++
 .../t/023-rewrite/socket-keepalive.t          |  986 +++++++
 .../t/023-rewrite/tcp-socket-timeout.t        |  611 ++++
 .../nginx-lua/t/023-rewrite/tcp-socket.t      | 2038 +++++++++++++
 .../nginx-lua/t/023-rewrite/unix-socket.t     |  152 +
 .../nginx-lua/t/023-rewrite/uthread-exec.t    |  352 +++
 .../nginx-lua/t/023-rewrite/uthread-exit.t    | 1353 +++++++++
 .../t/023-rewrite/uthread-redirect.t          |  195 ++
 .../nginx-lua/t/023-rewrite/uthread-spawn.t   | 1527 ++++++++++
 .../nginx-lua/t/024-access/client-abort.t     |  851 ++++++
 debian/modules/nginx-lua/t/024-access/exit.t  |   37 +-
 .../modules/nginx-lua/t/024-access/on-abort.t |  663 +++++
 .../modules/nginx-lua/t/024-access/redirect.t |    2 -
 .../modules/nginx-lua/t/024-access/req-body.t |    2 +-
 debian/modules/nginx-lua/t/024-access/sleep.t |  223 ++
 .../nginx-lua/t/024-access/uthread-exec.t     |  352 +++
 .../nginx-lua/t/024-access/uthread-exit.t     | 1353 +++++++++
 .../nginx-lua/t/024-access/uthread-redirect.t |  195 ++
 .../nginx-lua/t/024-access/uthread-spawn.t    | 1189 ++++++++
 debian/modules/nginx-lua/t/025-codecache.t    |   26 +-
 debian/modules/nginx-lua/t/026-mysql.t        |    6 +-
 .../modules/nginx-lua/t/027-multi-capture.t   |   47 +-
 debian/modules/nginx-lua/t/028-req-header.t   |  540 +++-
 debian/modules/nginx-lua/t/030-uri-args.t     |   97 +-
 debian/modules/nginx-lua/t/034-match.t        |   28 +-
 debian/modules/nginx-lua/t/035-gmatch.t       |  110 +-
 debian/modules/nginx-lua/t/037-gsub.t         |  186 +-
 .../modules/nginx-lua/t/041-header-filter.t   |  393 ++-
 debian/modules/nginx-lua/t/043-shdict.t       |  298 +-
 debian/modules/nginx-lua/t/044-req-body.t     |  582 +++-
 debian/modules/nginx-lua/t/055-subreq-vars.t  |   28 +-
 debian/modules/nginx-lua/t/056-flush.t        |  100 +-
 .../modules/nginx-lua/t/057-flush-timeout.t   |  168 +-
 debian/modules/nginx-lua/t/058-tcp-socket.t   |   97 +-
 debian/modules/nginx-lua/t/059-unix-socket.t  |   10 +-
 .../modules/nginx-lua/t/060-lua-memcached.t   |    1 -
 debian/modules/nginx-lua/t/061-lua-redis.t    |  140 +-
 debian/modules/nginx-lua/t/062-count.t        |   40 +-
 .../nginx-lua/t/065-tcp-socket-timeout.t      |  208 +-
 .../nginx-lua/t/066-socket-receiveuntil.t     |   91 +-
 debian/modules/nginx-lua/t/067-req-socket.t   |   56 +-
 .../nginx-lua/t/068-socket-keepalive.t        |  635 ++++-
 debian/modules/nginx-lua/t/069-null.t         |    4 +-
 debian/modules/nginx-lua/t/071-idle-socket.t  |   13 +-
 .../modules/nginx-lua/t/072-conditional-get.t |   14 +-
 debian/modules/nginx-lua/t/073-backtrace.t    |   30 +-
 debian/modules/nginx-lua/t/075-logby.t        |  520 ++++
 debian/modules/nginx-lua/t/077-sleep.t        |  214 ++
 debian/modules/nginx-lua/t/078-hup-vars.t     |   65 +
 .../nginx-lua/t/079-unused-directives.t       |  262 ++
 debian/modules/nginx-lua/t/080-hup-shdict.t   |   85 +
 debian/modules/nginx-lua/t/081-bytecode.t     |  229 ++
 debian/modules/nginx-lua/t/082-body-filter.t  |  485 ++++
 .../modules/nginx-lua/t/083-bad-sock-self.t   |  138 +
 .../nginx-lua/t/084-inclusive-receiveuntil.t  |  747 +++++
 debian/modules/nginx-lua/t/085-if.t           |  202 ++
 debian/modules/nginx-lua/t/086-init-by.t      |  199 ++
 debian/modules/nginx-lua/t/087-udp-socket.t   |  654 +++++
 debian/modules/nginx-lua/t/088-req-method.t   |  227 ++
 debian/modules/nginx-lua/t/089-phase.t        |  139 +
 .../nginx-lua/t/090-log-socket-errors.t       |  100 +
 debian/modules/nginx-lua/t/091-coroutine.t    |  925 ++++++
 debian/modules/nginx-lua/t/092-eof.t          |   84 +
 .../modules/nginx-lua/t/093-uthread-spawn.t   | 1675 +++++++++++
 debian/modules/nginx-lua/t/094-uthread-exit.t | 1644 +++++++++++
 debian/modules/nginx-lua/t/095-uthread-exec.t |  428 +++
 .../nginx-lua/t/096-uthread-redirect.t        |  282 ++
 .../modules/nginx-lua/t/097-uthread-rewrite.t |  353 +++
 debian/modules/nginx-lua/t/098-uthread-wait.t | 1225 ++++++++
 debian/modules/nginx-lua/t/099-c-api.t        |  363 +++
 debian/modules/nginx-lua/t/100-client-abort.t |  922 ++++++
 debian/modules/nginx-lua/t/101-on-abort.t     |  790 ++++++
 .../modules/nginx-lua/t/102-req-start-time.t  |  117 +
 debian/modules/nginx-lua/t/StapThread.pm      |  275 ++
 debian/modules/nginx-lua/tapset/ngx_lua.stp   |    5 +
 debian/modules/nginx-lua/util/build2.sh       |    7 +-
 debian/modules/nginx-lua/util/gdbinit         |   21 +
 debian/modules/nginx-lua/valgrind.suppress    |   80 +-
 169 files changed, 48115 insertions(+), 4369 deletions(-)
 create mode 100644 debian/modules/nginx-lua/.gitignore
 create mode 100644 debian/modules/nginx-lua/.gitmodules
 create mode 100644 debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h
 delete mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_conf.c
 delete mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_conf.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_coroutine.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_initby.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_initby.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_logby.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_logby.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_phase.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_phase.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_probe.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_req_method.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_req_method.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_sleep.h
 rename debian/modules/nginx-lua/src/{ngx_http_lua_socket.c => ngx_http_lua_socket_tcp.c} (72%)
 rename debian/modules/nginx-lua/src/{ngx_http_lua_socket.h => ngx_http_lua_socket_tcp.h} (64%)
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_uthread.h
 create mode 100644 debian/modules/nginx-lua/t/.gitignore
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/client-abort.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/on-abort.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/req-socket.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/sleep.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
 create mode 100644 debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/client-abort.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/on-abort.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/sleep.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/uthread-exec.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/uthread-exit.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/uthread-redirect.t
 create mode 100644 debian/modules/nginx-lua/t/024-access/uthread-spawn.t
 create mode 100644 debian/modules/nginx-lua/t/075-logby.t
 create mode 100644 debian/modules/nginx-lua/t/077-sleep.t
 create mode 100644 debian/modules/nginx-lua/t/078-hup-vars.t
 create mode 100644 debian/modules/nginx-lua/t/079-unused-directives.t
 create mode 100644 debian/modules/nginx-lua/t/080-hup-shdict.t
 create mode 100644 debian/modules/nginx-lua/t/081-bytecode.t
 create mode 100644 debian/modules/nginx-lua/t/082-body-filter.t
 create mode 100644 debian/modules/nginx-lua/t/083-bad-sock-self.t
 create mode 100644 debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
 create mode 100644 debian/modules/nginx-lua/t/085-if.t
 create mode 100644 debian/modules/nginx-lua/t/086-init-by.t
 create mode 100644 debian/modules/nginx-lua/t/087-udp-socket.t
 create mode 100644 debian/modules/nginx-lua/t/088-req-method.t
 create mode 100644 debian/modules/nginx-lua/t/089-phase.t
 create mode 100644 debian/modules/nginx-lua/t/090-log-socket-errors.t
 create mode 100644 debian/modules/nginx-lua/t/091-coroutine.t
 create mode 100644 debian/modules/nginx-lua/t/092-eof.t
 create mode 100644 debian/modules/nginx-lua/t/093-uthread-spawn.t
 create mode 100644 debian/modules/nginx-lua/t/094-uthread-exit.t
 create mode 100644 debian/modules/nginx-lua/t/095-uthread-exec.t
 create mode 100644 debian/modules/nginx-lua/t/096-uthread-redirect.t
 create mode 100644 debian/modules/nginx-lua/t/097-uthread-rewrite.t
 create mode 100644 debian/modules/nginx-lua/t/098-uthread-wait.t
 create mode 100644 debian/modules/nginx-lua/t/099-c-api.t
 create mode 100644 debian/modules/nginx-lua/t/100-client-abort.t
 create mode 100644 debian/modules/nginx-lua/t/101-on-abort.t
 create mode 100644 debian/modules/nginx-lua/t/102-req-start-time.t
 create mode 100644 debian/modules/nginx-lua/t/StapThread.pm
 create mode 100644 debian/modules/nginx-lua/tapset/ngx_lua.stp

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index d5e2646..f5a9db5 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -27,7 +27,7 @@ README for Modules versions
  nginx-lua
   Homepage: https://github.com/chaoslawful/lua-nginx-module
   https://github.com/chaoslawful/lua-nginx-module.git
-  Version: v0.5.0rc29-6446ee71b8
+  Version: v0.7.8
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/.gitignore b/debian/modules/nginx-lua/.gitignore
new file mode 100644
index 0000000..a0bf9c3
--- /dev/null
+++ b/debian/modules/nginx-lua/.gitignore
@@ -0,0 +1,157 @@
+build/
+work/
+tags
+cscope.*
+*.mobi
+genmobi.sh
+.libs
+*.swp
+*.slo
+*.la
+*.swo
+*.lo
+*~
+*.o
+print.txt
+.rsync
+*.tar.gz
+dist
+build[789]
+build
+tags
+update-readme
+*.tmp
+test/Makefile
+test/blib
+test.sh
+t.sh
+t/t.sh
+test/t/servroot/
+releng
+reset
+*.t_
+src/handler.h
+src/util.c
+src/module.h
+src/module.c
+src/drizzle.c
+src/processor.h
+src/handler.c
+src/util.h
+src/drizzle.h
+src/processor.c
+src/output.c
+src/output.h
+libdrizzle
+ctags
+src/stream.h
+nginx
+keepalive
+reindex
+src/keepalive.c
+src/keepalive.h
+src/checker.h
+src/checker.c
+src/quoting.h
+src/quoting.c
+src/module.h
+src/module.c
+src/util.h
+src/util.c
+src/processor.h
+src/processor.c
+src/rds.h
+src/utils.h
+src/handler.c
+src/handler.h
+util/bench
+*.html
+trace.out*
+try.sh
+src/cache.c
+src/cache.h
+src/common.h
+src/directive.c
+src/directive.h
+src/consts.[ch]
+src/contentby.[ch]
+src/pcrefix.[ch]
+src/util.c
+src/clfactory.c
+src/directive.c
+src/conf.h
+src/setby.h
+src/cache.h
+src/hook.c
+src/util.h
+src/hook.h
+src/common.h
+src/directive.h
+src/conf.c
+src/setby.c
+src/cache.c
+src/module.c
+src/clfactory.h
+src/capturefilter.[ch]
+src/contentby.c
+pack
+b.sh
+src/in.[ch]
+src/out.[ch]
+go
+all.sh
+src/accessby.[ch]
+src/rewriteby.[ch]
+src/patch.[ch]
+src/ndk.[ch]
+src/control.[ch]
+src/output.[ch]
+src/variable.[ch]
+src/string.[ch]
+src/misc.[ch]
+src/log.[ch]
+src/exception.[ch]
+src/subrequest.[ch]
+src/time.[ch]
+src/regex.[ch]
+src/ctx.[ch]
+src/args.[ch]
+src/headers.[ch]
+src/script.[ch]
+src/filter.[ch]
+src/shdict.[ch]
+src/body.[ch]
+src/uri.[ch]
+src/api.[ch]
+src/coroutine.[ch]
+src/logby.[ch]
+src/sleep.[ch]
+a.patch
+all
+build1[0-3]
+g
+buildroot/
+src/headerfilterby.[ch]
+*.patch
+analyze
+tsock
+a.c
+test.lua
+build12
+ERRORS
+src/bodyfilterby.[ch]
+src/tcp.[ch]
+src/initby.[ch]
+src/socket.[ch]
+src/udp.[ch]
+src/method.[ch]
+tre
+src/phase.[ch]
+src/probe.h
+src/uthread.[ch]
+*.plist
+lua
+Makefile
+tsubreq
+tthread
+addr2line
diff --git a/debian/modules/nginx-lua/.gitmodules b/debian/modules/nginx-lua/.gitmodules
new file mode 100644
index 0000000..db339a7
--- /dev/null
+++ b/debian/modules/nginx-lua/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "deps/ngx_devel_kit"]
+	path = deps/ngx_devel_kit
+	url = git://github.com/simpl/ngx_devel_kit.git
diff --git a/debian/modules/nginx-lua/README b/debian/modules/nginx-lua/README
index 49dfd2e..2e14c30 100644
--- a/debian/modules/nginx-lua/README
+++ b/debian/modules/nginx-lua/README
@@ -8,9 +8,9 @@ Status
     This module is under active development and is production ready.
 
 Version
-    This document describes ngx_lua v0.5.0rc28
-    (<https://github.com/chaoslawful/lua-nginx-module/tags>) released on 16
-    May 2012.
+    This document describes ngx_lua v0.7.8
+    (<https://github.com/chaoslawful/lua-nginx-module/tags>) released on 8
+    December 2012.
 
 Synopsis
         # set search paths for pure Lua external libraries (';;' is the default path):
@@ -115,7 +115,7 @@ Synopsis
             location /foo {
                 rewrite_by_lua '
                     res = ngx.location.capture("/memc",
-                        { args = { cmd = 'incr', key = ngx.var.uri } }
+                        { args = { cmd = "incr", key = ngx.var.uri } }
                     )
                 ';
 
@@ -160,7 +160,7 @@ Synopsis
                client_body_buffer_size 100k;
 
                access_by_lua '
-                   -- check the client IP addr is in our black list
+                   -- check the client IP address is in our black list
                    if ngx.var.remote_addr == "132.5.72.3" then
                        ngx.exit(ngx.HTTP_FORBIDDEN)
                    end
@@ -180,27 +180,57 @@ Synopsis
         }
 
 Description
-    This module embeds Lua, via the standard Lua interpreter or LuaJIT, into
-    Nginx and by leveraging Nginx's subrequests, allows the integration of
-    the powerful Lua threads (Lua coroutines) into the Nginx event model.
+    This module embeds Lua, via the standard Lua interpreter or LuaJIT 2.0
+    (<http://luajit.org/luajit.html>), into Nginx and by leveraging Nginx's
+    subrequests, allows the integration of the powerful Lua threads (Lua
+    coroutines) into the Nginx event model.
 
     Unlike Apache's mod_lua
     (<http://httpd.apache.org/docs/2.3/mod/mod_lua.html>) and Lighttpd's
     mod_magnet (<http://redmine.lighttpd.net/wiki/1/Docs:ModMagnet>), Lua
     code executed using this module can be *100% non-blocking* on network
     traffic as long as the Nginx API for Lua provided by this module is used
-    to handle requests to upstream services such as mysql, postgresql,
-    memcached, redis, or upstream http web services. (See
-    ngx.location.capture, ngx.location.capture_multi, ngx.socket.tcp,
-    [[HttpDrizzleModule]], ngx_postgres
-    (<http://github.com/FRiCKLE/ngx_postgres/>), [[HttpMemcModule]],
-    [[HttpRedis2Module]] and [[HttpProxyModule]] modules for details).
+    to handle requests to upstream services such as MySQL, PostgreSQL,
+    Memcached, Redis, or upstream HTTP web services.
+
+    At least the following Lua libraries and Nginx modules can be used with
+    this ngx_lua module:
+
+    *   lua-resty-memcached
+        (<https://github.com/agentzh/lua-resty-memcached>)
+
+    *   lua-resty-mysql (<https://github.com/agentzh/lua-resty-mysql>)
+
+    *   lua-resty-redis (<https://github.com/agentzh/lua-resty-redis>)
+
+    *   lua-resty-dns (<https://github.com/agentzh/lua-resty-dns>)
+
+    *   lua-resty-upload (<https://github.com/agentzh/lua-resty-upload>)
+
+    *   ngx_memc
+
+    *   ngx_postgres (<https://github.com/FRiCKLE/ngx_postgres>)
+
+    *   ngx_redis2
+
+    *   ngx_redis
+
+    *   ngx_proxy
+
+    *   ngx_fastcgi
+
+    Almost all the Nginx modules can be used with this ngx_lua module by
+    means of ngx.location.capture or ngx.location.capture_multi but it is
+    recommended to use those "lua-resty-*" libraries instead of creating
+    subrequests to access the Nginx upstream modules because the former is
+    usually much more flexible and memory-efficient.
 
     The Lua interpreter or LuaJIT instance is shared across all the requests
     in a single nginx worker process but request contexts are segregated
-    using lightweight Lua coroutines. Loaded Lua modules persist in the
-    nginx worker process level resulting in a small memory footprint even
-    when under heavy loads.
+    using lightweight Lua coroutines.
+
+    Loaded Lua modules persist in the nginx worker process level resulting
+    in a small memory footprint in Lua even when under heavy loads.
 
 Directives
   lua_code_cache
@@ -220,9 +250,9 @@ Directives
     request (such that Lua modules will not be cached either). With this in
     place, developers can adopt an edit-and-refresh approach.
 
-    Please note however, that Lua code inlined into nginx.conf such as those
-    specified by set_by_lua, content_by_lua, access_by_lua, and
-    rewrite_by_lua will *always* be cached because only the Nginx config
+    Please note however, that Lua code written inlined within nginx.conf
+    such as those specified by set_by_lua, content_by_lua, access_by_lua,
+    and rewrite_by_lua will *always* be cached because only the Nginx config
     file parser can correctly parse the "nginx.conf" file and the only ways
     to to reload the config file are to send a "HUP" signal or to restart
     Nginx.
@@ -275,7 +305,7 @@ Directives
     content_by_lua and others. The path string is in standard Lua path form,
     and ";;" can be used to stand for the original search paths.
 
-    Since the "v0.5.0rc29" release, the special notation $prefix or
+    As from the "v0.5.0rc29" release, the special notation $prefix or
     "${prefix}" can be used in the search path string to indicate the path
     of the "server prefix" usually determined by the "-p PATH" command-line
     option while starting the Nginx server.
@@ -292,17 +322,114 @@ Directives
     set_by_lua, content_by_lua and others. The cpath string is in standard
     Lua cpath form, and ";;" can be used to stand for the original cpath.
 
-    Since the "v0.5.0rc29" release, the special notation $prefix or
+    As from the "v0.5.0rc29" release, the special notation $prefix or
     "${prefix}" can be used in the search path string to indicate the path
     of the "server prefix" usually determined by the "-p PATH" command-line
     option while starting the Nginx server.
 
+  init_by_lua
+    syntax: *init_by_lua <lua-script-str>*
+
+    context: *http*
+
+    phase: *loading-config*
+
+    Runs the Lua code specified by the argument "<lua-script-str>" on the
+    global Lua VM level when the Nginx master process (if any) is loading
+    the Nginx config file.
+
+    When Nginx receives the "HUP" signal and starts reloading the config
+    file, the Lua VM will also be re-created and "init_by_lua" will run
+    again on the new Lua VM.
+
+    Usually you can register (true) Lua global variables or pre-load Lua
+    modules at server start-up by means of this hook. Here is an example for
+    pre-loading Lua modules:
+
+        init_by_lua 'require "cjson"';
+
+        server {
+            location = /api {
+                content_by_lua '
+                    ngx.say(cjson.encode({dog = 5, cat = 6}))
+                ';
+            }
+        }
+
+    You can also initialize the lua_shared_dict shm storage at this phase.
+    Here is an example for this:
+
+        lua_shared_dict dogs 1m;
+
+        init_by_lua '
+            local dogs = ngx.shared.dogs;
+            dogs:set("Tom", 56)
+        ';
+
+        server {
+            location = /api {
+                content_by_lua '
+                    local dogs = ngx.shared.dogs;
+                    ngx.say(dogs:get("Tom"))
+                ';
+            }
+        }
+
+    But note that, the lua_shared_dict's shm storage will not be cleared
+    through a config reload (via the "HUP" signal, for example). So if you
+    do *not* want to re-initialize the shm storage in your "init_by_lua"
+    code in this case, then you just need to set a custom flag in the shm
+    storage and always check the flag in your "init_by_lua" code.
+
+    Because the Lua code in this context runs before Nginx forks its worker
+    processes (if any), data or code loaded here will enjoy the
+    Copy-on-write (COW) (<http://en.wikipedia.org/wiki/Copy-on-write>)
+    feature provided by many operating systems among all the worker
+    processes, thus saving a lot of memory.
+
+    Only a small set of the Nginx API for Lua is supported in this context:
+
+    *   Logging APIs: ngx.log and print,
+
+    *   Shared Dictionary API: ngx.shared.DICT.
+
+    More Nginx APIs for Lua may be supported in this context upon future
+    user requests.
+
+    Basically you can safely use Lua libraries that do blocking I/O in this
+    very context because blocking the master process during server start-up
+    is completely okay. Even the Nginx core does blocking I/O (at least on
+    resolving upstream's host names) at the configure-loading phase.
+
+    You should be very careful about potential security vulnerabilities in
+    your Lua code registered in this context because the Nginx master
+    process is often run under the "root" account.
+
+    This directive was first introduced in the "v0.5.5" release.
+
+  init_by_lua_file
+    syntax: *init_by_lua_file <path-to-lua-script-file>*
+
+    context: *http*
+
+    phase: *loading-config*
+
+    Equivalent to init_by_lua, except that the file specified by
+    "<path-to-lua-script-file>" contains the Lua code or Lua/LuaJIT bytecode
+    to be executed.
+
+    When a relative path like "foo/bar.lua" is given, they will be turned
+    into the absolute path relative to the "server prefix" path determined
+    by the "-p PATH" command-line option while starting the Nginx server.
+
+    This directive was first introduced in the "v0.5.5" release.
+
   set_by_lua
     syntax: *set_by_lua $res <lua-script-str> [$arg1 $arg2 ...]*
 
-    context: *main, server, location, server if, location if*
+    context: *server, server if, location, location if*
 
-    phase: *rewrite*
+    phase: *server-rewrite, rewrite*
 
     Executes code specified in "<lua-script-str>" with optional input
     arguments "$arg1 $arg2 ...", and returns string output to $res. The code
@@ -314,8 +441,17 @@ Directives
     the Nginx event loop is blocked during code execution. Time consuming
     code sequences should therefore be avoided.
 
-    Note that I/O operations such as ngx.say, ngx.exec, echo and similar are
-    not permitted within the context of this directive.
+    Note that the following API functions are currently disabled within this
+    context:
+
+    *   Output API functions (e.g., ngx.say and ngx.send_headers)
+
+    *   Control API functions (e.g., ngx.exit)
+
+    *   Subrequest API functions (e.g., ngx.location.capture and
+        ngx.location.capture_multi)
+
+    *   Cosocket API functions (e.g., ngx.socket.tcp and ngx.req.socket).
 
     In addition, note that this directive can only write out a value to a
     single Nginx variable at a time. However, a workaround is possible using
@@ -344,9 +480,9 @@ Directives
         set_by_lua $bar 'tonumber(ngx.var.foo) + 1';
         set $baz "bar: $bar";  # $baz == "bar: 33"
 
-    Since the "0.5.0rc29" release, Nginx variable interpolation is disabled
-    in the "<lua-script-str>" argument of this directive, and you can use
-    the dollar sign character ("$") directly.
+    As from the "v0.5.0rc29" release, Nginx variable interpolation is
+    disabled in the "<lua-script-str>" argument of this directive and
+    therefore, the dollar sign character ("$") can be used directly.
 
     This directive requires the ngx_devel_kit
     (<https://github.com/simpl/ngx_devel_kit>) module.
@@ -355,19 +491,20 @@ Directives
     syntax: *set_by_lua_file $res <path-to-lua-script-file> [$arg1 $arg2
     ...]*
 
-    context: *main, server, location, server if, location if*
+    context: *server, server if, location, location if*
 
-    phase: *rewrite*
+    phase: *server-rewrite, rewrite*
 
     Equivalent to set_by_lua, except that the file specified by
-    "<path-to-lua-script-file>" contains the Lua code to be executed.
+    "<path-to-lua-script-file>" contains the Lua code, or, as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
 
     Nginx variable interpolation is supported in the
     "<path-to-lua-script-file>" argument string of this directive. But
     special care must be taken for injection attacks.
 
     When a relative path like "foo/bar.lua" is given, they will be turned
-    into the absoluate path relative to the "server prefix" path determined
+    into the absolute path relative to the "server prefix" path determined
     by the "-p PATH" command-line option while starting the Nginx server.
 
     When the Lua code cache is turned on (by default), the user code is
@@ -403,14 +540,15 @@ Directives
     phase: *content*
 
     Equivalent to content_by_lua, except that the file specified by
-    "<path-to-lua-script-file>" contains the Lua code to be executed.
+    "<path-to-lua-script-file>" contains the Lua code, or, as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
 
     Nginx variables can be used in the "<path-to-lua-script-file>" string to
     provide flexibility. This however carries some risks and is not
     ordinarily recommended.
 
     When a relative path like "foo/bar.lua" is given, they will be turned
-    into the absoluate path relative to the "server prefix" path determined
+    into the absolute path relative to the "server prefix" path determined
     by the "-p PATH" command-line option while starting the Nginx server.
 
     When the Lua code cache is turned on (by default), the user code is
@@ -490,7 +628,7 @@ Directives
             fastcgi_pass ...;
         }
 
-    can be implemented in "ngx_lua" as:
+    can be implemented in ngx_lua as:
 
         location = /check-spam {
             internal;
@@ -501,7 +639,7 @@ Directives
             rewrite_by_lua '
                 local res = ngx.location.capture("/check-spam")
                 if res.body == "spam" then
-                    ngx.redirect("/terms-of-use.html")
+                    return ngx.redirect("/terms-of-use.html")
                 end
             ';
 
@@ -535,9 +673,12 @@ Directives
     Here the Lua code "ngx.exit(503)" will never run. This will be the case
     if "rewrite ^ /bar last" is used as this will similarly initiate an
     internal redirection. If the "break" modifier is used instead, there
-    will be no internal redirection and the rewrite_by_lua code will be
+    will be no internal redirection and the "rewrite_by_lua" code will be
     executed.
 
+    The "rewrite_by_lua" code will always run at the end of the "rewrite"
+    request-processing phase unless rewrite_by_lua_no_postpone is turned on.
+
   rewrite_by_lua_file
     syntax: *rewrite_by_lua_file <path-to-lua-script-file>*
 
@@ -546,14 +687,15 @@ Directives
     phase: *rewrite tail*
 
     Equivalent to rewrite_by_lua, except that the file specified by
-    "<path-to-lua-script-file>" contains the Lua code to be executed.
+    "<path-to-lua-script-file>" contains the Lua code, or, as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
 
     Nginx variables can be used in the "<path-to-lua-script-file>" string to
     provide flexibility. This however carries some risks and is not
     ordinarily recommended.
 
     When a relative path like "foo/bar.lua" is given, they will be turned
-    into the absoluate path relative to the "server prefix" path determined
+    into the absolute path relative to the "server prefix" path determined
     by the "-p PATH" command-line option while starting the Nginx server.
 
     When the Lua code cache is turned on (by default), the user code is
@@ -562,6 +704,10 @@ Directives
     can be temporarily disabled during development by switching
     lua_code_cache "off" in "nginx.conf" to avoid reloading Nginx.
 
+    The "rewrite_by_lua_file" code will always run at the end of the
+    "rewrite" request-processing phase unless rewrite_by_lua_no_postpone is
+    turned on.
+
   access_by_lua
     syntax: *access_by_lua <lua-script-str>*
 
@@ -605,7 +751,7 @@ Directives
             # proxy_pass/fastcgi_pass/postgres_pass/...
         }
 
-    can be implemented in "ngx_lua" as:
+    can be implemented in ngx_lua as:
 
         location / {
             access_by_lua '
@@ -644,14 +790,15 @@ Directives
     phase: *access tail*
 
     Equivalent to access_by_lua, except that the file specified by
-    "<path-to-lua-script-file>" contains the Lua code to be executed.
+    "<path-to-lua-script-file>" contains the Lua code, or, as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
 
     Nginx variables can be used in the "<path-to-lua-script-file>" string to
     provide flexibility. This however carries some risks and is not
     ordinarily recommended.
 
     When a relative path like "foo/bar.lua" is given, they will be turned
-    into the absoluate path relative to the "server prefix" path determined
+    into the absolute path relative to the "server prefix" path determined
     by the "-p PATH" command-line option while starting the Nginx server.
 
     When the Lua code cache is turned on (by default), the user code is
@@ -669,16 +816,20 @@ Directives
     phase: *output-header-filter*
 
     Uses Lua code specified in "<lua-script-str>" to define an output header
-    filter. Note that the following API functions are currently disabled
-    within this context:
+    filter.
+
+    Note that the following API functions are currently disabled within this
+    context:
 
     *   Output API functions (e.g., ngx.say and ngx.send_headers)
 
-    *   Control API functions (e.g., ngx.exit)
+    *   Control API functions (e.g., ngx.exit and ngx.exec)
 
     *   Subrequest API functions (e.g., ngx.location.capture and
         ngx.location.capture_multi)
 
+    *   Cosocket API functions (e.g., ngx.socket.tcp and ngx.req.socket).
+
     Here is an example of overriding a response header (or adding one if
     absent) in our Lua header filter:
 
@@ -697,14 +848,212 @@ Directives
     phase: *output-header-filter*
 
     Equivalent to header_filter_by_lua, except that the file specified by
-    "<path-to-lua-script-file>" contains the Lua code to be executed.
+    "<path-to-lua-script-file>" contains the Lua code, or as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
 
     When a relative path like "foo/bar.lua" is given, they will be turned
-    into the absoluate path relative to the "server prefix" path determined
+    into the absolute path relative to the "server prefix" path determined
     by the "-p PATH" command-line option while starting the Nginx server.
 
     This directive was first introduced in the "v0.2.1rc20" release.
 
+  body_filter_by_lua
+    syntax: *body_filter_by_lua <lua-script-str>*
+
+    context: *http, server, location, location if*
+
+    phase: *output-body-filter*
+
+    Uses Lua code specified in "<lua-script-str>" to define an output body
+    filter.
+
+    The input data chunk is passed via ngx.arg[1] (as a Lua string value)
+    and the "eof" flag indicating the end of the response body data stream
+    is passed via ngx.arg[2] (as a Lua boolean value).
+
+    Behind the scene, the "eof" flag is just the "last_buf" flag of the
+    nginx chain link buffers. And in the context of an Nginx subrequest,
+    there is no "eof" flag at all, due to the underlying limitation in the
+    Nginx core.
+
+    The output data stream can be aborted immediately by running the
+    following Lua statement:
+
+        return ngx.ERROR
+
+    This will truncate the response body and usually result in incomplete
+    and also invalid responses.
+
+    The Lua code can pass its own modified version of the input data chunk
+    to the downstream Nginx output body filters by overriding ngx.arg[1]
+    with a Lua string or a Lua table of strings. For example, to transform
+    all the lowercase letters in the response body, we can just write:
+
+        location / {
+            proxy_pass http://mybackend;
+            body_filter_by_lua 'ngx.arg[1] = string.upper(ngx.arg[1])';
+        }
+
+    When setting "nil" or an empty Lua string value to "ngx.arg[1]", no data
+    chunk will be passed to the downstream Nginx output filters at all.
+
+    Likewise, new "eof" flag can also be specified by setting a boolean
+    value to ngx.arg[2]. For example,
+
+        location /t {
+            echo hello world;
+            echo hiya globe;
+
+            body_filter_by_lua '
+                local chunk = ngx.arg[1]
+                if string.match(chunk, "hello") then
+                    ngx.arg[2] = true  -- new eof
+                    return
+                end
+
+                -- just throw away any remaining chunk data
+                ngx.arg[1] = nil
+            ';
+        }
+
+    Then "GET /t" will just return the output
+
+        hello world
+
+    That is, when the body filter sees a chunk containing the word "hello",
+    then it will set the "eof" flag to true immediately, resulting in
+    truncated but still valid responses.
+
+    When the Lua code may change the length of the response body, then it is
+    required to always clear out the "Content-Length" response header (if
+    any) in a header filter to enforce streaming output, as in
+
+        location /foo {
+            # fastcgi_pass/proxy_pass/...
+
+            header_filter_by_lua 'ngx.header.content_length = nil';
+            body_filter_by_lua 'ngx.arg[1] = {string.len(arg[1]), "\n"}'
+        }
+
+    Note that the following API functions are currently disabled within this
+    context:
+
+    *   Output API functions (e.g., ngx.say and ngx.send_headers)
+
+    *   Control API functions (e.g., ngx.exit and ngx.exec)
+
+    *   Subrequest API functions (e.g., ngx.location.capture and
+        ngx.location.capture_multi)
+
+    *   Cosocket API functions (e.g., ngx.socket.tcp and ngx.req.socket).
+
+    Nginx output filters may be called multiple times for a single request
+    because response body may be delivered in chunks. Thus, the Lua code
+    specified by in this directive may also run multiple times in the
+    lifetime of a single HTTP request.
+
+    This directive was first introduced in the "v0.5.0rc32" release.
+
+  body_filter_by_lua_file
+    syntax: *body_filter_by_lua_file <path-to-lua-script-file>*
+
+    context: *http, server, location, location if*
+
+    phase: *output-body-filter*
+
+    Equivalent to body_filter_by_lua, except that the file specified by
+    "<path-to-lua-script-file>" contains the Lua code, or, as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
+
+    When a relative path like "foo/bar.lua" is given, they will be turned
+    into the absolute path relative to the "server prefix" path determined
+    by the "-p PATH" command-line option while starting the Nginx server.
+
+    This directive was first introduced in the "v0.5.0rc32" release.
+
+  log_by_lua
+    syntax: *log_by_lua <lua-script-str>*
+
+    context: *http, server, location, location if*
+
+    phase: *log*
+
+    Run the Lua source code inlined as the "<lua-script-str>" at the "log"
+    request processing phase. This does not replace the current access logs,
+    but runs after.
+
+    Note that the following API functions are currently disabled within this
+    context:
+
+    *   Output API functions (e.g., ngx.say and ngx.send_headers)
+
+    *   Control API functions (e.g., ngx.exit)
+
+    *   Subrequest API functions (e.g., ngx.location.capture and
+        ngx.location.capture_multi)
+
+    *   Cosocket API functions (e.g., ngx.socket.tcp and ngx.req.socket).
+
+    Here is an example of gathering average data for
+    $upstream_response_time:
+
+        lua_shared_dict log_dict 5M;
+
+        server {
+            location / {
+                proxy_pass http://mybackend;
+
+                log_by_lua '
+                    local log_dict = ngx.shared.log_dict
+                    local upstream_time = tonumber(ngx.var.upstream_response_time)
+
+                    local sum = log_dict:get("upstream_time-sum") or 0
+                    sum = sum + upstream_time
+                    log_dict:set("upstream_time-sum", sum)
+
+                    local newval, err = log_dict:incr("upstream_time-nb", 1)
+                    if not newval and err == "not found" then
+                        log_dict:add("upstream_time-nb", 0)
+                        log_dict:incr("upstream_time-nb", 1)
+                    end
+                ';
+            }
+
+            location = /status {
+                content_by_lua '
+                    local log_dict = ngx.shared.log_dict
+                    local sum = log_dict:get("upstream_time-sum")
+                    local nb = log_dict:get("upstream_time-nb")
+
+                    if nb and sum then
+                        ngx.say("average upstream response time: ", sum / nb,
+                                " (", nb, " reqs)")
+                    else
+                        ngx.say("no data yet")
+                    end
+                ';
+            }
+        }
+
+    This directive was first introduced in the "v0.5.0rc31" release.
+
+  log_by_lua_file
+    syntax: *log_by_lua_file <path-to-lua-script-file>*
+
+    context: *http, server, location, location if*
+
+    phase: *log*
+
+    Equivalent to log_by_lua, except that the file specified by
+    "<path-to-lua-script-file>" contains the Lua code, or, as from the
+    "v0.5.0rc32" release, the Lua/LuaJIT bytecode to be executed.
+
+    When a relative path like "foo/bar.lua" is given, they will be turned
+    into the absolute path relative to the "server prefix" path determined
+    by the "-p PATH" command-line option while starting the Nginx server.
+
+    This directive was first introduced in the "v0.5.0rc31" release.
+
   lua_need_request_body
     syntax: *lua_need_request_body <on|off>*
 
@@ -724,8 +1073,8 @@ Directives
     client_body_buffer_size must have the same value as
     client_max_body_size. Because when the content length exceeds
     client_body_buffer_size but less than client_max_body_size, Nginx will
-    automatically buffer the data into a temporary file on the disk, which
-    will lead to empty value in the $request_body variable.
+    buffer the data into a temporary file on the disk, which will lead to
+    empty value in the $request_body variable.
 
     If the current location includes rewrite_by_lua or rewrite_by_lua_file
     directives, then the request body will be read just before the
@@ -750,8 +1099,8 @@ Directives
 
     phase: *depends on usage*
 
-    Declares a shared memory zone, "<name>", to serve as storage for the
-    shm-based Lua dictionary "ngx.shared.<name>".
+    Declares a shared memory zone, "<name>", to serve as storage for the shm
+    based Lua dictionary "ngx.shared.<name>".
 
     The "<size>" argument accepts size units such as "k" and "m":
 
@@ -856,9 +1205,9 @@ Directives
 
     Default to 30 connections for every pool.
 
-    When the connection pool is exceeding the size limit, the least recently
-    used (idle) connection already in the pool will be closed automatically
-    to make room for the current connection.
+    When the connection pool exceeds the available size limit, the least
+    recently used (idle) connection already in the pool will be closed to
+    make room for the current connection.
 
     Note that the cosocket connection pool is per nginx worker process
     rather than per nginx server instance, so so size limit specified here
@@ -875,15 +1224,30 @@ Directives
 
     This directive controls the default maximal idle time of the connections
     in the cosocket built-in connection pool. When this timeout reaches,
-    idle connections will be closed automatically and removed from the pool.
-    This setting can be overridden by cosocket objects' setkeepalive method.
+    idle connections will be closed and removed from the pool. This setting
+    can be overridden by cosocket objects' setkeepalive method.
 
     The "<time>" argument can be an integer, with an optional time unit,
     like "s" (second), "ms" (millisecond), "m" (minute). The default time
-    unit is "s", ie, "second". The default setting is "60s".
+    unit is "s", i.e., "second". The default setting is "60s".
 
     This directive was first introduced in the "v0.5.0rc1" release.
 
+  lua_socket_log_errors
+    syntax: *lua_socket_log_errors on|off*
+
+    default: *lua_socket_log_errors on*
+
+    context: *http, server, location*
+
+    This directive can be used to toggle error logging when a failure occurs
+    for the TCP or UDP cosockets. If you are already doing proper error
+    handling and logging in your Lua code, then it is recommended to turn
+    this directive off to prevent data flushing in your nginx error log
+    files (which is usually rather expensive).
+
+    This directive was first introduced in the "v0.5.13" release.
+
   lua_http10_buffering
     syntax: *lua_http10_buffering on|off*
 
@@ -891,17 +1255,17 @@ Directives
 
     context: *http, server, location, location-if*
 
-    Enables or disables the automatic response caching for HTTP 1.0 (or
-    older) requests. This buffering mechanism is mainly used for HTTP 1.0
-    keep-alive which replies on a proper "Content-Length" response header.
+    Enables or disables response caching for HTTP 1.0 (or older) requests.
+    This buffering mechanism is mainly used for HTTP 1.0 keep-alive which
+    replies on a proper "Content-Length" response header.
 
     If the Lua code explicitly sets a "Content-Length" response header
-    before sending the headers (either explicity via ngx.send_headers or
+    before sending the headers (either explicitly via ngx.send_headers or
     implicitly via the first ngx.say or ngx.print call).
 
-    If you want to output huge response data in a streaming fashion (via the
-    ngx.flush call, for example), then you MUST turn off this directive to
-    prevent memory footprint boost.
+    To output very large response data in a streaming fashion (via the
+    ngx.flush call, for example), this directive MUST be turned off to
+    minimize memory usage.
 
     This directive is turned "on" by default.
 
@@ -921,6 +1285,66 @@ Directives
 
     This directive was first introduced in the "v0.5.0rc29" release.
 
+  lua_transform_underscores_in_response_headers
+    syntax: *lua_transform_underscores_in_response_headers on|off*
+
+    default: *lua_transform_underscores_in_response_headers on*
+
+    context: *http, server, location, location-if*
+
+    Controls whether to transform underscores ("_") in the response header
+    names specified in the ngx.header.HEADER API to hypens ("-").
+
+    This directive was first introduced in the "v0.5.0rc32" release.
+
+  lua_check_client_abort
+    syntax: *lua_check_client_abort on|off*
+
+    default: *lua_check_client_abort off*
+
+    context: *http, server, location, location-if*
+
+    This directive controls whether to check for premature client connection
+    abortion.
+
+    When this directive is turned on, the ngx_lua module will monitor the
+    premature connection close event on the downstream connections. And when
+    there is such an event, it will call the user Lua function callback
+    (registered by ngx.on_abort) or just stop and clean up all the Lua
+    "light threads" running in the current request's request handler when
+    there is no user callback function registered.
+
+    According to the current implementation, however, if the client closes
+    the connection before the Lua code finishes reading the request body
+    data via ngx.req.socket, then ngx_lua will neither stop all the running
+    "light threads" nor call the user callback (if ngx.on_abort has been
+    called). Instead, the reading operation on ngx.req.socket will just
+    return the error message "client aborted" as the second return value
+    (the first return value is surely "nil").
+
+    When TCP keepalive is disabled, it is relying on the client side to
+    close the socket gracefully (by sending a "FIN" packet or something like
+    that). For (soft) real-time web applications, it is highly recommended
+    to configure the TCP keepalive
+    (<http://tldp.org/HOWTO/TCP-Keepalive-HOWTO/overview.html>) support in
+    your system's TCP stack implementation in order to detect "half-open"
+    TCP connections in time.
+
+    For example, on Linux, you can configure the standard listen directive
+    in your "nginx.conf" file like this:
+
+        listen 80 so_keepalive=2s:2s:8;
+
+    On FreeBSD, you can only tune the system-wide configuration for TCP
+    keepalive, for example:
+
+        # sysctl net.inet.tcp.keepintvl=2000
+        # sysctl net.inet.tcp.keepidle=2000
+
+    This directive was first introduced in the "v0.7.4" release.
+
+    See also ngx.on_abort.
+
 Nginx API for Lua
   Introduction
     The various *_by_lua and *_by_lua_file configuration directives serve as
@@ -929,24 +1353,22 @@ Nginx API for Lua
     context of these configuration directives.
 
     The API is exposed to Lua in the form of two standard packages "ngx" and
-    "ndk". These packages are in the default global scope within "ngx_lua"
-    and are always available within "ngx_lua" directives.
+    "ndk". These packages are in the default global scope within ngx_lua and
+    are always available within ngx_lua directives.
 
-    The packages can be introduced into external Lua modules by using the
-    package.seeall
-    (<http://www.lua.org/manual/5.1/manual.html#pdf-package.seeall>) option:
+    The packages can be introduced into external Lua modules like this:
 
-        module("my_module", package.seeall)
+        local say = ngx.say
 
-        function say(a) ngx.say(a) end
+        module(...)
 
-    Alternatively, they can be imported to external Lua modules by using
-    file scoped local Lua variables:
+        function foo(a) 
+            say(a) 
+        end
 
-        local ngx = ngx
-        module("my_module")
-
-        function say(a) ngx.say(a) end
+    Use of the package.seeall
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-package.seeall>) flag is
+    strongly discouraged due to its various bad side-effects.
 
     It is also possible to directly require the packages in external Lua
     modules:
@@ -970,10 +1392,11 @@ Nginx API for Lua
   ngx.arg
     syntax: *val = ngx.arg[index]*
 
-    context: *set_by_lua**
+    context: *set_by_lua*, body_filter_by_lua**
 
-    Index the input arguments to the set_by_lua and set_by_lua_file
-    directives:
+    When this is used in the context of the set_by_lua or set_by_lua_file
+    directives, this table is read-only and holds the input arguments to the
+    config directives:
 
         value = ngx.arg[n]
 
@@ -992,11 +1415,22 @@ Nginx API for Lua
 
     that writes out 88, the sum of 32 and 56.
 
+    When this table is used in the context of body_filter_by_lua or
+    body_filter_by_lua_file, the first element holds the input data chunk to
+    the output filter code and the second element holds the boolean flag for
+    the "eof" flag indicating the end of the whole output data stream.
+
+    The data chunk and "eof" flag passed to the downstream Nginx output
+    filters can also be overridden by assigning values directly to the
+    corresponding table elements. When setting "nil" or an empty Lua string
+    value to "ngx.arg[1]", no data chunk will be passed to the downstream
+    Nginx output filters at all.
+
   ngx.var.VARIABLE
     syntax: *ngx.var.VAR_NAME*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Read and write Nginx variable values.
 
@@ -1028,9 +1462,22 @@ Nginx API for Lua
 
         ngx.var.args = nil
 
+    WARNING When reading from an Nginx variable, Nginx will allocate memory
+    in the per-request memory pool which is freed only at request
+    termination. So when you need to read from an Nginx variable repeatedly
+    in your Lua code, cache the Nginx variable value to your own Lua
+    variable, for example,
+
+        local val = ngx.var.some_var
+        --- use the val repeatedly later
+
+    to prevent (temporary) memory leaking within the current request's
+    lifetime.
+
   Core constants
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua,
+    *log_by_lua**
 
       ngx.OK (0)
       ngx.ERROR (-1)
@@ -1044,18 +1491,18 @@ Nginx API for Lua
 
       ngx.null
 
-    The "ngx.null" constant is a "NULL" light userdata which is usually used
-    to represent nil values in Lua tables and etc. It is identical with the
-    lua-cjson (<http://www.kyne.com.au/~mark/software/lua-cjson.php>)
-    library's "cjson.null" constant. This constant was first introduced in
-    the "v0.5.0rc5" release.
+    The "ngx.null" constant is a "NULL" light userdata usually used to
+    represent nil values in Lua tables etc and is similar to the lua-cjson
+    (<http://www.kyne.com.au/~mark/software/lua-cjson.php>) library's
+    "cjson.null" constant. This constant was first introduced in the
+    "v0.5.0rc5" release.
 
     The "ngx.DECLINED" constant was first introduced in the "v0.5.0rc19"
     release.
 
   HTTP method constants
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
       ngx.HTTP_GET
       ngx.HTTP_HEAD
@@ -1068,8 +1515,8 @@ Nginx API for Lua
     ngx.location.capture_multi method calls.
 
   HTTP status constants
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
       value = ngx.HTTP_OK (200)
       value = ngx.HTTP_CREATED (201)
@@ -1091,7 +1538,7 @@ Nginx API for Lua
 
   Nginx log level constants
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
       ngx.STDERR
       ngx.EMERG
@@ -1108,8 +1555,8 @@ Nginx API for Lua
   print
     syntax: *print(...)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
     Writes argument values into the nginx "error.log" file with the
     "ngx.NOTICE" log level.
@@ -1122,17 +1569,16 @@ Nginx API for Lua
     while Lua booleans result in literal "true" or "false" strings. And the
     "ngx.null" constant will yield the "null" string output.
 
-    There is a hard-coded length limitation on the error messages in the
-    Nginx core. It is 2048 bytes at most, including the trailing newlines
-    and the leading timestamps. You can manually modify this limit by
-    modifying the "NGX_MAX_ERROR_STR" macro definition in the
-    "src/core/ngx_log.h" file in the Nginx source tree. If the message size
-    exceeds this limit, the Nginx core will truncate the message text
-    automatically.
+    There is a hard coded 2048 byte limitation on error message lengths in
+    the Nginx core. This limit includes trailing newlines and leading time
+    stamps. If the message size exceeds this limit, Nginx will truncate the
+    message text accordingly. This limit can be manually modified by editing
+    the "NGX_MAX_ERROR_STR" macro definition in the "src/core/ngx_log.h"
+    file in the Nginx source tree.
 
   ngx.ctx
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
     This table can be used to store per-request Lua context data and has a
     life time identical to the current request (as with the Nginx
@@ -1236,8 +1682,7 @@ Nginx API for Lua
     Nginx's subrequests provide a powerful way to make non-blocking internal
     requests to other locations configured with disk file directory or *any*
     other nginx C modules like "ngx_proxy", "ngx_fastcgi", "ngx_memc",
-    "ngx_postgres", "ngx_drizzle", and even "ngx_lua" itself and etc etc
-    etc.
+    "ngx_postgres", "ngx_drizzle", and even ngx_lua itself and etc etc etc.
 
     Also note that subrequests just mimic the HTTP interface but there is
     *no* extra HTTP/TCP traffic *nor* IPC involved. Everything works
@@ -1263,7 +1708,7 @@ Nginx API for Lua
         Set-Cookie: foo=bar
         Set-Cookie: baz=blah
 
-    Then "res.header["Set-Cookie"]" will be evaluted to the table value
+    Then "res.header["Set-Cookie"]" will be evaluated to the table value
     "{"a=3", "foo=bar", "baz=blah"}".
 
     URI query strings can be concatenated to URI itself, for instance,
@@ -1327,10 +1772,10 @@ Nginx API for Lua
 
         ngx.location.capture('/foo?a=1&b=3&c=%3a')
 
-    that is, this method will automatically escape argument keys and values
-    according to URI rules and concatenating them together into a complete
-    query string. The format for the Lua table passed as the "args" argument
-    is identical to the format used in the ngx.encode_args method.
+    that is, this method will escape argument keys and values according to
+    URI rules and concatenate them together into a complete query string.
+    The format for the Lua table passed as the "args" argument is identical
+    to the format used in the ngx.encode_args method.
 
     The "args" option can also take plain query strings:
 
@@ -1353,9 +1798,9 @@ Nginx API for Lua
     This option is set to "false" by default
 
         location /other {
-            set $dog "$dog world";                  
-            echo "$uri dog: $dog";                    
-        }                                     
+            set $dog "$dog world";
+            echo "$uri dog: $dog";
+        }
 
         location /lua {
             set $dog 'hello';
@@ -1365,7 +1810,7 @@ Nginx API for Lua
 
                 ngx.print(res.body)
                 ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-            ';  
+            ';
         }
 
     Accessing location "/lua" gives
@@ -1436,23 +1881,23 @@ Nginx API for Lua
     the ngx.ctx table for the subrequest.
 
         location /sub {
-            content_by_lua '                          
-                ngx.ctx.foo = "bar";                  
+            content_by_lua '
+                ngx.ctx.foo = "bar";
             ';
-        }   
+        }
         location /lua {
             content_by_lua '
-                local ctx = {}                        
+                local ctx = {}
                 res = ngx.location.capture("/sub", { ctx = ctx })
 
                 ngx.say(ctx.foo);
-                ngx.say(ngx.ctx.foo);                 
-            ';                                        
+                ngx.say(ngx.ctx.foo);
+            ';
         }
 
     Then request "GET /lua" gives
 
-        bar                                               
+        bar
         nil
 
     It is also possible to use this "ctx" option to share the same ngx.ctx
@@ -1484,18 +1929,20 @@ Nginx API for Lua
     in subrequest locations.
 
     There is a hard-coded upper limit on the number of concurrent
-    subrequests every main request. In older versions of Nginx, the limit is
-    50, which is then increased to 200 in recent Nginx "1.1.x" releases. You
-    can manually edit this limit by modifying the definition of the
-    "NGX_HTTP_MAX_SUBREQUESTS" macro in the
-    "nginx/src/http/ngx_http_request.h" file in the Nginx source tree. When
-    you are exceeding this limit, you will get the following error message
-    in your "error.log" file:
+    subrequests possible for every main request. In older versions of Nginx,
+    the limit was 50 concurrent subrequests and in more recent versions,
+    Nginx "1.1.x" onwards, this was increased to 200 concurrent subrequests.
+    When this limit is exceeded, the following error message is added to the
+    "error.log" file:
 
         [error] 13983#0: *1 subrequests cycle while processing "/uri"
 
-    Please also refer to restrictions on capturing locations that include
-    Echo Module directives.
+    The limit can be manually modified if required by editing the definition
+    of the "NGX_HTTP_MAX_SUBREQUESTS" macro in the
+    "nginx/src/http/ngx_http_request.h" file in the Nginx source tree.
+
+    Please also refer to restrictions on capturing locations configured by
+    subrequest directives of other modules.
 
   ngx.location.capture_multi
     syntax: *res1, res2, ... = ngx.location.capture_multi({ {uri, options?},
@@ -1554,12 +2001,12 @@ Nginx API for Lua
                 return ngx.location.capture_multi({ {uri, args} })
             end
 
-    Please also refer to restrictions on capturing locations that include
-    Echo Module directives.
+    Please also refer to restrictions on capturing locations configured by
+    subrequest directives of other modules.
 
   ngx.status
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
     Read and write the current request's response status. This should be
     called before sending out the response headers.
@@ -1567,17 +2014,27 @@ Nginx API for Lua
         ngx.status = ngx.HTTP_CREATED
         status = ngx.status
 
+    Setting "ngx.status" after the response header is sent out has no effect
+    but leaving an error message in your nginx's error log file:
+
+        attempt to set ngx.status after sending out response headers
+
   ngx.header.HEADER
     syntax: *ngx.header.HEADER = VALUE*
 
     syntax: *value = ngx.header.HEADER*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
-    Set, add to, or clear the current request "HEADER" response header.
-    Underscores ("_") in the header names will be replaced by dashes ("-")
-    and the header names will be matched case-insensitively.
+    Set, add to, or clear the current request's "HEADER" response header
+    that is to be sent.
+
+    Underscores ("_") in the header names will be replaced by hyphens ("-")
+    by default. This transformation can be turned off via the
+    lua_transform_underscores_in_response_headers directive.
+
+    The header names are matched case-insensitively.
 
         -- equivalent to ngx.header["Content-Type"] = 'text/plain'
         ngx.header.content_type = 'text/plain';
@@ -1660,11 +2117,62 @@ Nginx API for Lua
     For reading *request* headers, use the ngx.req.get_headers function
     instead.
 
+  ngx.req.start_time
+    syntax: *secs = ngx.req.start_time()*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
+
+    Returns a floating-point number representing the timestamp (including
+    milliseconds as the decimal part) when the current request was created.
+
+    The following example emulates the $request_time variable value
+    (provided by [[HttpLogModule]]) in pure Lua:
+
+        local request_time = ngx.now() - ngx.req.start_time()
+
+    This function was first introduced in the "v0.7.7" release.
+
+    See also ngx.now and ngx.update_time.
+
+  ngx.req.get_method
+    syntax: *method_name = ngx.req.get_method()*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
+    header_filter_by_lua**
+
+    Retrieves the current request's request method name. Strings like "GET"
+    and "POST" are returned instead of numerical method constants.
+
+    If the current request is an Nginx subrequest, then the subrequest's
+    method name will be returned.
+
+    This method was first introduced in the "v0.5.6" release.
+
+    See also ngx.req.set_method.
+
+  ngx.req.set_method
+    syntax: *ngx.req.set_method(method_id)*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
+    header_filter_by_lua**
+
+    Overrides the current request's request method with the "request_id"
+    argument. Currently only numerical method constants are supported, like
+    "ngx.HTTP_POST" and "ngx.HTTP_GET".
+
+    If the current request is an Nginx subrequest, then the subrequest's
+    method will be overridden.
+
+    This method was first introduced in the "v0.5.6" release.
+
+    See also ngx.req.get_method.
+
   ngx.req.set_uri
     syntax: *ngx.req.set_uri(uri, jump?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua**
 
     Rewrite the current request's (parsed) URI by the "uri" argument. The
     "uri" argument must be a Lua string and cannot be of zero length, or a
@@ -1745,7 +2253,7 @@ Nginx API for Lua
     syntax: *ngx.req.set_uri_args(args)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua**
 
     Rewrite the current request's URI query arguments by the "args"
     argument. The "args" argument can be either a Lua string, as in
@@ -1756,14 +2264,14 @@ Nginx API for Lua
 
         ngx.req.set_uri_args({ a = 3, b = "hello world" })
 
-    where in the latter case, this method will automatically escape argument
-    keys and values according to the URI escaping rule.
+    where in the latter case, this method will escape argument keys and
+    values according to the URI escaping rule.
 
     Multi-value arguments are also supported:
 
         ngx.req.set_uri_args({ a = 3, b = {5, 6} })
 
-    which will result in a querystring like "a=3&b=5&b=6".
+    which will result in a query string like "a=3&b=5&b=6".
 
     This interface was first introduced in the "v0.3.1rc13" release.
 
@@ -1773,7 +2281,7 @@ Nginx API for Lua
     syntax: *args = ngx.req.get_uri_args(max_args?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
     Returns a Lua table holding all the current request URL query arguments.
 
@@ -1798,8 +2306,8 @@ Nginx API for Lua
     Multiple occurrences of an argument key will result in a table value
     holding all the values for that key in order.
 
-    Keys and values are automatically unescaped according to URI escaping
-    rules. In the settings above, "GET /test?a%20b=1%61+2" will yield:
+    Keys and values are unescaped according to URI escaping rules. In the
+    settings above, "GET /test?a%20b=1%61+2" will yield:
 
         a b: 1a 2
 
@@ -1852,7 +2360,7 @@ Nginx API for Lua
     syntax: *ngx.req.get_post_args(max_args?)*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
     Returns a Lua table holding all the current request POST query arguments
     (of the MIME type "application/x-www-form-urlencoded"). Call
@@ -1886,8 +2394,7 @@ Nginx API for Lua
     Multiple occurrences of an argument key will result in a table value
     holding all of the values for that key in order.
 
-    Keys and values will be automatically unescaped according to URI
-    escaping rules.
+    Keys and values will be unescaped according to URI escaping rules.
 
     With the settings above,
 
@@ -1932,10 +2439,10 @@ Nginx API for Lua
     Removing the "max_args" cap is strongly discouraged.
 
   ngx.req.get_headers
-    syntax: *headers = ngx.req.get_headers(max_headers?)*
+    syntax: *headers = ngx.req.get_headers(max_headers?, raw?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
     Returns a Lua table holding all the current request headers.
 
@@ -1980,15 +2487,35 @@ Nginx API for Lua
 
     Removing the "max_headers" cap is strongly discouraged.
 
+    Since the 0.6.9 release, all the header names in the Lua table returned
+    are converted to the pure lower-case form by default, unless the "raw"
+    argument is set to "true" (default to "false").
+
+    Also, by default, an "__index" metamethod is added to the resulting Lua
+    table and will normalize the keys to a pure lowercase form with all
+    underscores converted to dashes in case of a lookup miss. For example,
+    if a request header "My-Foo-Header" is present, then the following
+    invocations will all pick up the value of this header correctly:
+
+        ngx.say(headers.my_foo_header)
+        ngx.say(headers["My-Foo-Header"])
+        ngx.say(headers["my-foo-header"])
+
+    The "__index" metamethod will not be added when the "raw" argument is
+    set to "true".
+
   ngx.req.set_header
     syntax: *ngx.req.set_header(header_name, header_value)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*
 
     Set the current request's request header named "header_name" to value
-    "header_value", overriding any existing ones. None of the current
-    request's subrequests will be affected.
+    "header_value", overriding any existing ones.
+
+    By default, all the subrequests subsequently initiated by
+    ngx.location.capture and ngx.location.capture_multi will inherit the new
+    header.
 
     Here is an example of setting the "Content-Length" header:
 
@@ -2014,6 +2541,15 @@ Nginx API for Lua
 
         ngx.req.clear_header("X-Foo")
 
+  ngx.req.clear_header
+    syntax: *ngx.req.clear_header(header_name)*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
+    header_filter_by_lua*, body_filter_by_lua**
+
+    Clear the current request's request header named "header_name". None of
+    the current request's subrequests will be affected.
+
   ngx.req.read_body
     syntax: *ngx.req.read_body()*
 
@@ -2093,7 +2629,7 @@ Nginx API for Lua
 
     If the request body has not been read yet, call ngx.req.read_body first
     (or turned on lua_need_request_body to force this module to read the
-    request body automatically, but this is not recommended).
+    request body. This is not recommended however).
 
     If the request body has been read into disk files, try calling the
     ngx.req.get_body_file function instead.
@@ -2117,13 +2653,13 @@ Nginx API for Lua
     Retrieves the file name for the in-file request body data. Returns "nil"
     if the request body has not been read or has been read into memory.
 
-    The returned file is read only and is usually cleaned up automatically
-    by Nginx's memory pool. It should not be manually modified, renamed, or
-    removed in Lua code.
+    The returned file is read only and is usually cleaned up by Nginx's
+    memory pool. It should not be manually modified, renamed, or removed in
+    Lua code.
 
     If the request body has not been read yet, call ngx.req.read_body first
     (or turned on lua_need_request_body to force this module to read the
-    request body automatically, but this is not recommended).
+    request body. This is not recommended however).
 
     If the request body has been read into memory, try calling the
     ngx.req.get_body_data function instead.
@@ -2173,9 +2709,9 @@ Nginx API for Lua
     by the "file_name" argument.
 
     If the optional "auto_clean" argument is given a "true" value, then this
-    file will be automatically removed at request completion or the next
-    time this function or ngx.req.set_body_data are called in the same
-    request. The "auto_clean" is default to "false".
+    file will be removed at request completion or the next time this
+    function or ngx.req.set_body_data are called in the same request. The
+    "auto_clean" is default to "false".
 
     Please ensure that the file specified by the "file_name" argument exists
     and is readable by an Nginx worker process by setting its permission
@@ -2200,6 +2736,90 @@ Nginx API for Lua
 
     See also ngx.req.set_body_data.
 
+  ngx.req.init_body
+    syntax: *ngx.req.init_body(buffer_size?)*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Creates a new blank request body for the current request and inializes
+    the buffer for later request body data writing via the
+    ngx.req.append_body and ngx.req.finish_body APIs.
+
+    If the "buffer_size" argument is specified, then its value will be used
+    for the size of the memory buffer for body writing with
+    ngx.req.append_body. If the argument is omitted, then the value
+    specified by the standard client_body_buffer_size directive will be used
+    instead.
+
+    When the data can no longer be hold in the memory buffer for the request
+    body, then the data will be flushed onto a temporary file just like the
+    standard request body reader in the Nginx core.
+
+    It is important to always call the ngx.req.finish_body after all the
+    data has been appended onto the current request body. Also, when this
+    function is used together with ngx.req.socket, it is required to call
+    ngx.req.socket *before* this function, or you will get the "request body
+    already exists" error message.
+
+    The usage of this function is often like this:
+
+        ngx.req.init_body(128 * 1024)  -- buffer is 128KB
+        for chunk in next_data_chunk() do
+            ngx.req.append_body(chunk) -- each chunk can be 4KB
+        end
+        ngx.req.finish_body()
+
+    This function can be used with ngx.req.append_body, ngx.req.finish_body,
+    and ngx.req.socket to implement efficient input filters in pure Lua (in
+    the context of rewrite_by_lua* or access_by_lua*), which can be used
+    with other Nginx content handler or upstream modules like
+    [[HttpProxyModule]] and [[HttpFastcgiModule]].
+
+    This function was first introduced in the "v0.5.11" release.
+
+  ngx.req.append_body
+    syntax: *ngx.req.append_body(data_chunk)*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Append new data chunk specified by the "data_chunk" argument onto the
+    existing request body created by the ngx.req.init_body call.
+
+    When the data can no longer be hold in the memory buffer for the request
+    body, then the data will be flushed onto a temporary file just like the
+    standard request body reader in the Nginx core.
+
+    It is important to always call the ngx.req.finish_body after all the
+    data has been appended onto the current request body.
+
+    This function can be used with ngx.req.init_body, ngx.req.finish_body,
+    and ngx.req.socket to implement efficient input filters in pure Lua (in
+    the context of rewrite_by_lua* or access_by_lua*), which can be used
+    with other Nginx content handler or upstream modules like
+    [[HttpProxyModule]] and [[HttpFastcgiModule]].
+
+    This function was first introduced in the "v0.5.11" release.
+
+    See also ngx.req.init_body.
+
+  ngx.req.finish_body
+    syntax: *ngx.req.finish_body()*
+
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Completes the construction process of the new request body created by
+    the ngx.req.init_body and ngx.req.append_body calls.
+
+    This function can be used with ngx.req.init_body, ngx.req.append_body,
+    and ngx.req.socket to implement efficient input filters in pure Lua (in
+    the context of rewrite_by_lua* or access_by_lua*), which can be used
+    with other Nginx content handler or upstream modules like
+    [[HttpProxyModule]] and [[HttpFastcgiModule]].
+
+    This function was first introduced in the "v0.5.11" release.
+
+    See also ngx.req.init_body.
+
   ngx.req.socket
     syntax: *tcpsock, err = ngx.req.socket()*
 
@@ -2217,22 +2837,12 @@ Nginx API for Lua
     lua_need_request_body directive, and do not mix this call with
     ngx.req.read_body and ngx.req.discard_body.
 
-    If there is any request body data that has been preread into the Nginx
-    core's request header buffer, the resulting cosocket object will take
-    care of that automatically. So there will not be any data loss due to
-    potential body data prereading.
+    If any request body data has been pre-read into the Nginx core request
+    header buffer, the resulting cosocket object will take care of this to
+    avoid potential data loss resulting from such pre-reading.
 
     This function was first introduced in the "v0.5.0rc1" release.
 
-  ngx.req.clear_header
-    syntax: *ngx.req.clear_header(header_name)*
-
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
-
-    Clear the current request's request header named "header_name". None of
-    the current request's subrequests will be affected.
-
   ngx.exec
     syntax: *ngx.exec(uri, args?)*
 
@@ -2263,8 +2873,7 @@ Nginx API for Lua
         ngx.exec("/foo", "a=3&b=hello%20world")
 
     Alternatively, a Lua table can be passed for the "args" argument for
-    ngx_lua to carry out URI escaping and string concatenation
-    automatically.
+    ngx_lua to carry out URI escaping and string concatenation.
 
         ngx.exec("/foo", { a = 3, b = "hello world" })
 
@@ -2280,7 +2889,7 @@ Nginx API for Lua
     This method *must* be called before ngx.send_headers or explicit
     response body outputs by either ngx.print or ngx.say.
 
-    It's strongly recommended to combine the "return" statement with this
+    It is strongly recommended to combine the "return" statement with this
     call, i.e., "return ngx.exec(...)".
 
     This method is similar to the echo_exec directive of the
@@ -2305,7 +2914,7 @@ Nginx API for Lua
 
         return ngx.redirect("http://localhost:1984/foo", ngx.HTTP_MOVED_TEMPORARILY)
 
-    We can also use the numberical code directly as the second "status"
+    We can also use the numerical code directly as the second "status"
     argument:
 
         return ngx.redirect("/foo", 301)
@@ -2313,8 +2922,6 @@ Nginx API for Lua
     This method *must* be called before ngx.send_headers or explicit
     response body outputs by either ngx.print or ngx.say.
 
-    This method never returns.
-
     This method is very much like the rewrite directive with the "redirect"
     modifier in the standard [[HttpRewriteModule]], for example, this
     "nginx.conf" snippet
@@ -2337,8 +2944,9 @@ Nginx API for Lua
 
         return ngx.redirect('/foo?a=3&b=4')
 
-    It's strongly recommended to combine the "return" statement with this
-    call, i.e., "return ngx.redirect(...)".
+    This method call terminates the current request's processing and never
+    returns. It is recommended to combine the "return" statement with this
+    call, i.e., "return ngx.redirect(...)", so as to be more explicit.
 
   ngx.send_headers
     syntax: *ngx.send_headers()*
@@ -2348,15 +2956,13 @@ Nginx API for Lua
     Explicitly send out the response headers.
 
     Note that there is normally no need to manually send out response
-    headers as "ngx_lua" will automatically send headers out before content
-    is output with ngx.say or ngx.print or when content_by_lua exits
-    normally.
+    headers as ngx_lua will automatically send headers out before content is
+    output with ngx.say or ngx.print or when content_by_lua exits normally.
 
   ngx.headers_sent
     syntax: *value = ngx.headers_sent*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
 
     Returns "true" if the response headers have been sent (by ngx_lua), and
     "false" otherwise.
@@ -2409,8 +3015,9 @@ Nginx API for Lua
   ngx.log
     syntax: *ngx.log(log_level, ...)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Log arguments concatenated to error.log with the given logging level.
 
@@ -2421,13 +3028,12 @@ Nginx API for Lua
     The "log_level" argument can take constants like "ngx.ERR" and
     "ngx.WARN". Check out Nginx log level constants for details.
 
-    There is a hard-coded length limitation on the error messages in the
-    Nginx core. It is 2048 bytes at most, including the trailing newlines
-    and the leading timestamps. You can manually modify this limit by
-    modifying the "NGX_MAX_ERROR_STR" macro definition in the
-    "src/core/ngx_log.h" file in the Nginx source tree. If the message size
-    exceeds this limit, the Nginx core will truncate the message text
-    automatically.
+    There is a hard coded 2048 byte limitation on error message lengths in
+    the Nginx core. This limit includes trailing newlines and leading time
+    stamps. If the message size exceeds this limit, Nginx will truncate the
+    message text accordingly. This limit can be manually modified by editing
+    the "NGX_MAX_ERROR_STR" macro definition in the "src/core/ngx_log.h"
+    file in the Nginx source tree.
 
   ngx.flush
     syntax: *ngx.flush(wait?)*
@@ -2499,21 +3105,61 @@ Nginx API for Lua
     Note that while this method accepts all HTTP status constants as input,
     it only accepts "NGX_OK" and "NGX_ERROR" of the core constants.
 
-    It's strongly recommended to combine the "return" statement with this
-    call, i.e., "return ngx.exit(...)".
+    It is recommended, though not necessary, to combine the "return"
+    statement with this call, i.e., "return ngx.exit(...)", to give a visual
+    hint to others reading the code.
 
   ngx.eof
     syntax: *ngx.eof()*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-    Explicitly specify the end of the response output stream.
+    Explicitly specify the end of the response output stream. In the case of
+    HTTP 1.1 chunked encoded output, it will just trigger the Nginx core to
+    send out the "last chunk".
+
+    When you disable the HTTP 1.1 keep-alive feature for your downstream
+    connections, you can rely on descent HTTP clients to close the
+    connection actively for you when you call this method. This trick can be
+    used do back-ground jobs without letting the HTTP clients to wait on the
+    connection, as in the following example:
+
+        location = /async {
+            keepalive_timeout 0;
+            content_by_lua '
+                ngx.say("got the task!")
+                ngx.eof()  -- descent HTTP client will close the connection at this point
+                -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
+            ';
+        }
+
+    But if you create subrequests to access other locations configured by
+    Nginx upstream modules, then you should configure those upstream modules
+    to ignore client connection abortions if they are not by default. For
+    example, by default the standard [[HttpProxyModule]] will terminate both
+    the subrequest and the main request as soon as the client closes the
+    connection, so it is important to turn on the proxy_ignore_client_abort
+    directive in your location block configured by [[HttpProxyModule]]:
+
+        proxy_ignore_client_abort on;
+
+  ngx.sleep
+    syntax: *ngx.sleep(seconds)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Sleeps for the specified seconds without blocking. One can specify time
+    resolution up to 0.001 seconds (i.e., one milliseconds).
+
+    Behind the scene, this method makes use of the Nginx timers.
+
+    This method was introduced in the "0.5.0rc30" release.
 
   ngx.escape_uri
     syntax: *newstr = ngx.escape_uri(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Escape "str" as a URI component.
 
@@ -2521,7 +3167,7 @@ Nginx API for Lua
     syntax: *newstr = ngx.unescape_uri(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Unescape "str" as an escaped URI component.
 
@@ -2537,7 +3183,7 @@ Nginx API for Lua
     syntax: *str = ngx.encode_args(table)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Encode the Lua table to a query args string according to the URI encoded
     rules.
@@ -2553,7 +3199,7 @@ Nginx API for Lua
     The table keys must be Lua strings.
 
     Multi-value query args are also supported. Just use a Lua table for the
-    arg's value, for example:
+    argument's value, for example:
 
         ngx.encode_args({baz = {32, "hello"}})
 
@@ -2581,13 +3227,13 @@ Nginx API for Lua
     syntax: *table = ngx.decode_args(str, max_args?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Decodes a URI encoded query-string into a Lua table. This is the inverse
     function of ngx.encode_args.
 
-    The optional "max_args" argument can be used to specify the
-    maximalnumber of arguments parsed from the "str" argument. By default, a
+    The optional "max_args" argument can be used to specify the maximum
+    number of arguments parsed from the "str" argument. By default, a
     maximum of 100 request arguments are parsed (including those with the
     same name) and that additional URI arguments are silently discarded to
     guard against potential denial of service attacks.
@@ -2605,7 +3251,7 @@ Nginx API for Lua
     syntax: *newstr = ngx.encode_base64(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Encode "str" to a base64 digest.
 
@@ -2613,7 +3259,7 @@ Nginx API for Lua
     syntax: *newstr = ngx.decode_base64(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Decodes the "str" argument as a base64 digest to the raw form. Returns
     "nil" if "str" is not well formed.
@@ -2622,7 +3268,7 @@ Nginx API for Lua
     syntax: *intval = ngx.crc32_short(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Calculates the CRC-32 (Cyclic Redundancy Code) digest for the "str"
     argument.
@@ -2640,7 +3286,7 @@ Nginx API for Lua
     syntax: *intval = ngx.crc32_long(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Calculates the CRC-32 (Cyclic Redundancy Code) digest for the "str"
     argument.
@@ -2658,7 +3304,7 @@ Nginx API for Lua
     syntax: *digest = ngx.hmac_sha1(secret_key, str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Computes the HMAC-SHA1 (<http://en.wikipedia.org/wiki/HMAC>) digest of
     the argument "str" and turns the result using the secret key
@@ -2679,7 +3325,7 @@ Nginx API for Lua
 
         R/pvxzHC4NLtj7S+kXFg/NePTmk=
 
-    This API requires the OpenSSL library enabled in the Nignx build
+    This API requires the OpenSSL library enabled in the Nginx build
     (usually by passing the "--with-http_ssl_module" option to the
     "./configure" script).
 
@@ -2689,7 +3335,7 @@ Nginx API for Lua
     syntax: *digest = ngx.md5(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns the hexadecimal representation of the MD5 digest of the "str"
     argument.
@@ -2710,7 +3356,7 @@ Nginx API for Lua
     syntax: *digest = ngx.md5_bin(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns the binary form of the MD5 digest of the "str" argument.
 
@@ -2720,13 +3366,12 @@ Nginx API for Lua
     syntax: *digest = ngx.sha1_bin(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns the binary form of the SHA-1 digest of the "str" argument.
 
-    This function requires enabling SHA-1 support in your Nginx build
-    (usually you just need to install OpenSSL to your system while building
-    Nginx).
+    This function requires SHA-1 support in the Nginx build. (This usually
+    just means OpenSSL should be installed while building Nginx).
 
     This function was first introduced in the "v0.5.0rc6".
 
@@ -2734,7 +3379,7 @@ Nginx API for Lua
     syntax: *str = ngx.today()*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns current date (in the format "yyyy-mm-dd") from the nginx cached
     time (no syscall involved unlike Lua's date library).
@@ -2745,9 +3390,9 @@ Nginx API for Lua
     syntax: *secs = ngx.time()*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-    Returns the elapsed seconds from the epoch for the current timestamp
+    Returns the elapsed seconds from the epoch for the current time stamp
     from the nginx cached time (no syscall involved unlike Lua's date
     library).
 
@@ -2758,15 +3403,15 @@ Nginx API for Lua
     syntax: *secs = ngx.now()*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns a floating-point number for the elapsed time in seconds
-    (including microseconds as the decimal part) from the epoch for the
-    current timestamp from the nginx cached time (no syscall involved unlike
-    Lua's date library).
+    (including milliseconds as the decimal part) from the epoch for the
+    current time stamp from the nginx cached time (no syscall involved
+    unlike Lua's date library).
 
-    Use the Nginx core timer_resolution directive to adjust the accuracy or
-    forcibly update the Nginx time cache by calling ngx.update_time first.
+    You can forcibly update the Nginx time cache by calling ngx.update_time
+    first.
 
     This API was first introduced in "v0.3.1rc32".
 
@@ -2774,7 +3419,7 @@ Nginx API for Lua
     syntax: *ngx.update_time()*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Forcibly updates the Nginx current time cache. This call involves a
     syscall and thus has some overhead, so do not abuse it.
@@ -2785,9 +3430,9 @@ Nginx API for Lua
     syntax: *str = ngx.localtime()*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-    Returns the current timestamp (in the format "yyyy-mm-dd hh:mm:ss") of
+    Returns the current time stamp (in the format "yyyy-mm-dd hh:mm:ss") of
     the nginx cached time (no syscall involved unlike Lua's os.date
     (<http://www.lua.org/manual/5.1/manual.html#pdf-os.date>) function).
 
@@ -2797,9 +3442,9 @@ Nginx API for Lua
     syntax: *str = ngx.utctime()*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-    Returns the current timestamp (in the format "yyyy-mm-dd hh:mm:ss") of
+    Returns the current time stamp (in the format "yyyy-mm-dd hh:mm:ss") of
     the nginx cached time (no syscall involved unlike Lua's os.date
     (<http://www.lua.org/manual/5.1/manual.html#pdf-os.date>) function).
 
@@ -2809,10 +3454,10 @@ Nginx API for Lua
     syntax: *str = ngx.cookie_time(sec)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns a formated string can be used as the cookie expiration time. The
-    parameter "sec" is the timestamp in seconds (like those returned from
+    parameter "sec" is the time stamp in seconds (like those returned from
     ngx.time).
 
         ngx.say(ngx.cookie_time(1290079655))
@@ -2822,11 +3467,11 @@ Nginx API for Lua
     syntax: *str = ngx.http_time(sec)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns a formated string can be used as the http header time (for
     example, being used in "Last-Modified" header). The parameter "sec" is
-    the timestamp in seconds (like those returned from ngx.time).
+    the time stamp in seconds (like those returned from ngx.time).
 
         ngx.say(ngx.http_time(1290079655))
             -- yields "Thu, 18 Nov 10 11:27:35 GMT"
@@ -2835,7 +3480,7 @@ Nginx API for Lua
     syntax: *sec = ngx.parse_http_time(str)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Parse the http time string (as returned by ngx.http_time) into seconds.
     Returns the seconds or "nil" if the input string is in bad forms.
@@ -2849,7 +3494,7 @@ Nginx API for Lua
     syntax: *value = ngx.is_subrequest*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Returns "true" if the current request is an nginx subrequest, or "false"
     otherwise.
@@ -2858,9 +3503,9 @@ Nginx API for Lua
     syntax: *captures = ngx.re.match(subject, regex, options?, ctx?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-    Matches the "subject" string using the Perl-compatible regular
+    Matches the "subject" string using the Perl compatible regular
     expression "regex" with the optional "options".
 
     Only the first occurrence of the match is returned, or "nil" if no match
@@ -2869,7 +3514,7 @@ Nginx API for Lua
 
     When a match is found, a Lua table "captures" is returned, where
     "captures[0]" holds the whole substring being matched, and "captures[1]"
-    holds the first parenthesized subpattern's capturing, "captures[2]" the
+    holds the first parenthesized sub-pattern's capturing, "captures[2]" the
     second, and so on.
 
         local m = ngx.re.match("hello, 1234", "[0-9]+")
@@ -2879,7 +3524,7 @@ Nginx API for Lua
         -- m[0] == "1234"
         -- m[1] == "1"
 
-    Unmatched subpatterns will have "nil" values in their "captures" table
+    Unmatched sub-patterns will have "nil" values in their "captures" table
     fields.
 
         local m = ngx.re.match("hello, world", "(world)|(hello)")
@@ -2896,17 +3541,16 @@ Nginx API for Lua
                       this requires PCRE 6.0+ or else a Lua exception will be thrown.
                       first introduced in ngx_lua v0.3.1rc30.
 
-        i             caseless mode (similar to Perl's /i modifier)
+        i             case insensitive mode (similar to Perl's /i modifier)
 
         j             enable PCRE JIT compilation, this requires PCRE 8.21+ which
-                      must be built with the --enable-jit option.
-                      for optimum performance, this option should always be used  
-                      together with the 'o' option.
+                      must be built with the --enable-jit option. for optimum performance,
+                      this option should always be used together with the 'o' option.
                       first introduced in ngx_lua v0.3.1rc30.
 
         m             multi-line mode (similar to Perl's /m modifier)
 
-        o             compile-once mode (similar to Perl's /o modifer),
+        o             compile-once mode (similar to Perl's /o modifier),
                       to enable the worker-process-level compiled-regex cache
 
         s             single-line mode (similar to Perl's /s modifier)
@@ -2959,11 +3603,11 @@ Nginx API for Lua
     This method requires the PCRE library enabled in Nginx. (Known Issue
     With Special PCRE Sequences).
 
-    To confirm that PCRE JIT is indeed enabled, it's required to enable the
-    debugging logs in your Nginx build (by passing the "--with-debug" option
-    to your Nginx or ngx_openresty's "./configure" script) and enable the
-    "debug" error log level in your "error_log" directive, and then you can
-    see the following message if PCRE JIT actually works:
+    To confirm that PCRE JIT is enabled, activate the Nginx debug log by
+    adding the "--with-debug" option to Nginx or ngx_openresty's
+    "./configure" script. Then, enable the "debug" error log level in
+    "error_log" directive. The following message will be generated if PCRE
+    JIT is enabled:
 
         pcre JIT compiling result: 1
 
@@ -2973,13 +3617,13 @@ Nginx API for Lua
     syntax: *iterator = ngx.re.gmatch(subject, regex, options?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Similar to ngx.re.match, but returns a Lua iterator instead, so as to
     let the user programmer iterate all the matches over the "<subject>"
     string argument with the PCRE "regex".
 
-    Here is a small exmple to demonstrate its basic usage:
+    Here is a small example to demonstrate its basic usage:
 
         local iterator = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
         local m
@@ -3010,9 +3654,9 @@ Nginx API for Lua
     syntax: *newstr, n = ngx.re.sub(subject, regex, replace, options?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-    Substitutes the first match of the Perl-compatible regular expression
+    Substitutes the first match of the Perl compatible regular expression
     "regex" on the "subject" argument string with the string or function
     argument "replace". The optional "options" argument has exactly the same
     meaning as in ngx.re.match.
@@ -3074,7 +3718,7 @@ Nginx API for Lua
     syntax: *newstr, n = ngx.re.gsub(subject, regex, replace, options?)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Just like ngx.re.sub, but does global substitution.
 
@@ -3099,8 +3743,9 @@ Nginx API for Lua
   ngx.shared.DICT
     syntax: *dict = ngx.shared.DICT*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Fetching the shm-based Lua dictionary object for the shared memory zone
     named "DICT" defined by the lua_shared_dict directive.
@@ -3121,6 +3766,8 @@ Nginx API for Lua
 
     *   flush_all
 
+    *   flush_expired
+
     Here is an example:
 
         http {
@@ -3171,7 +3818,7 @@ Nginx API for Lua
     syntax: *value, flags = ngx.shared.DICT:get(key)*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     Retrieving the value in the dictionary ngx.shared.DICT for the key
     "key". If the key does not exist or has been expired, then "nil" will be
@@ -3205,8 +3852,9 @@ Nginx API for Lua
     syntax: *success, err, forcible = ngx.shared.DICT:set(key, value,
     exptime?, flags?)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Unconditionally sets a key-value pair into the shm-based dictionary
     ngx.shared.DICT. Returns three values:
@@ -3265,14 +3913,18 @@ Nginx API for Lua
 
     This feature was first introduced in the "v0.3.1rc22" release.
 
+    Please note that while internally the key-value pair is set atomically,
+    the atomicity does not go across the method call boundary.
+
     See also ngx.shared.DICT.
 
   ngx.shared.DICT.add
     syntax: *success, err, forcible = ngx.shared.DICT:add(key, value,
     exptime?, flags?)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Just like the set method, but only stores the key-value pair into the
     dictionary ngx.shared.DICT if the key does *not* exist.
@@ -3289,8 +3941,9 @@ Nginx API for Lua
     syntax: *success, err, forcible = ngx.shared.DICT:replace(key, value,
     exptime?, flags?)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Just like the set method, but only stores the key-value pair into the
     dictionary ngx.shared.DICT if the key *does* exist.
@@ -3306,8 +3959,9 @@ Nginx API for Lua
   ngx.shared.DICT.delete
     syntax: *ngx.shared.DICT:delete(key)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Unconditionally removes the key-value pair from the shm-based dictionary
     ngx.shared.DICT.
@@ -3321,8 +3975,9 @@ Nginx API for Lua
   ngx.shared.DICT.incr
     syntax: *newval, err = ngx.shared.DICT:incr(key, value)*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Increments the (numerical) value for "key" in the shm-based dictionary
     ngx.shared.DICT by the step value "value". Returns the new resulting
@@ -3345,23 +4000,233 @@ Nginx API for Lua
   ngx.shared.DICT.flush_all
     syntax: *ngx.shared.DICT:flush_all()*
 
-    context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
 
     Flushes out all the items in the dictionary.
 
     This feature was first introduced in the "v0.5.0rc17" release.
 
-    See also ngx.shared.DICT.
+    See also ngx.shared.DICT.flush_expired and ngx.shared.DICT.
+
+  ngx.shared.DICT.flush_expired
+    syntax: *flushed = ngx.shared.DICT:flush_expired(max_count?)*
+
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
+
+    Flushes out the expired items in the dictionary, up to the maximal
+    number specified by the optional "max_count" argument. When the
+    "max_count" argument is given 0 or not given at all, then it means
+    unlimited. Returns the number of items that have actually been flushed.
+
+    This feature was first introduced in the "v0.6.3" release.
+
+    See also ngx.shared.DICT.flush_all and ngx.shared.DICT.
+
+  ngx.shared.DICT.get_keys
+    syntax: *keys = ngx.shared.DICT:get_keys(max_count?)*
+
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
+
+    Fetch a list of the keys from the dictionary, up to "<max_count>".
+
+    By default, only the first 1024 keys (if any) are returned. When the
+    "<max_count>" argument is given the value 0, then all the keys will be
+    returned even there is more than 1024 keys in the dictionary.
+
+    WARNING Be careful when calling this method on dictionaries with a
+    really huge number of keys. This method may lock the dictionary for
+    quite a while and block all the nginx worker processes that are trying
+    to access the dictionary.
+
+    This feature was first introduced in the "v0.7.3" release.
+
+  ngx.socket.udp
+    syntax: *udpsock = ngx.socket.udp()*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Creates and returns a UDP or datagram-oriented unix domain socket object
+    (also known as one type of the "cosocket" objects). The following
+    methods are supported on this object:
+
+    *   setpeername
+
+    *   send
+
+    *   receive
+
+    *   close
+
+    *   settimeout
+
+    It is intended to be compatible with the UDP API of the LuaSocket
+    (<http://w3.impa.br/~diego/software/luasocket/udp.html>) library but is
+    100% nonblocking out of the box.
+
+    This feature was first introduced in the "v0.5.7" release.
+
+    See also ngx.socket.tcp.
+
+  udpsock:setpeername
+    syntax: *ok, err = udpsock:setpeername(host, port)*
+
+    syntax: *ok, err =
+    udpsock:setpeername("unix:/path/to/unix-domain.socket")*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Attempts to connect a UDP socket object to a remote server or to a
+    datagram unix domain socket file. Because the datagram protocol is
+    actually connection-less, this method does not really establish a
+    "connection", but only just set the name of the remote peer for
+    subsequent read/write operations.
+
+    Both IP addresses and domain names can be specified as the "host"
+    argument. In case of domain names, this method will use Nginx core's
+    dynamic resolver to parse the domain name without blocking and it is
+    required to configure the resolver directive in the "nginx.conf" file
+    like this:
+
+        resolver 8.8.8.8;  # use Google's public DNS nameserver
+
+    If the nameserver returns multiple IP addresses for the host name, this
+    method will pick up one randomly.
+
+    In case of error, the method returns "nil" followed by a string
+    describing the error. In case of success, the method returns 1.
+
+    Here is an example for connecting to a UDP (memcached) server:
+
+        location /test {
+            resolver 8.8.8.8;
+
+            content_by_lua '
+                local sock = ngx.socket.udp()
+                local ok, err = sock:setpeername("my.memcached.server.domain", 11211)
+                if not ok then
+                    ngx.say("failed to connect to memcached: ", err)
+                    return
+                end
+                ngx.say("successfully connected to memcached!")
+                sock:close()
+            ';
+        }
+
+    Connecting to a datagram unix domain socket file is also possible:
+
+        local sock = ngx.socket.udp()
+        local ok, err = sock:setpeername("unix:/tmp/some-datagram-service.sock")
+        if not ok then
+            ngx.say("failed to connect to the datagram unix domain socket: ", err)
+            return
+        end
+
+    assuming the datagram service is listening on the unix domain socket
+    file "/tmp/some-datagram-service.sock".
+
+    Calling this method on an already connected socket object will cause the
+    original connection to be closed first.
+
+    This method was first introduced in the "v0.5.7" release.
+
+  udpsock:send
+    syntax: *ok, err = udpsock:send(data)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Sends data on the current UDP or datagram unix domain socket object.
+
+    In case of success, it returns 1. Otherwise, it returns "nil" and a
+    string describing the error.
+
+    The input argument "data" can either be a Lua string or a (nested) Lua
+    table holding string fragments. In case of table arguments, this method
+    will copy all the string elements piece by piece to the underlying Nginx
+    socket send buffers, which is usually optimal than doing string
+    concatenation operations on the Lua land.
+
+    This feature was first introduced in the "v0.5.7" release.
+
+  udpsock:receive
+    syntax: *data, err = udpsock:receive(size?)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Receives data from the UDP or datagram unix domain socket object with an
+    optional receive buffer size argument, "size".
+
+    This method is a synchronous operation and is 100% nonblocking.
+
+    In case of success, it returns the data received; in case of error, it
+    returns "nil" with a string describing the error.
+
+    If the "size" argument is specified, then this method will use this size
+    as the receive buffer size. But when this size is greater than 8192,
+    then 8192 will be used instead.
+
+    If no argument is specified, then the maximal buffer size, 8192 is
+    assumed.
+
+    Timeout for the reading operation is controlled by the
+    lua_socket_read_timeout config directive and the settimeout method. And
+    the latter takes priority. For example:
+
+        sock:settimeout(1000)  -- one second timeout
+        local data, err = sock:receive()
+        if not data then
+            ngx.say("failed to read a packet: ", data)
+            return
+        end
+        ngx.say("successfully read a packet: ", data)
+
+    It is important here to call the settimeout method *before* calling this
+    method.
+
+    This feature was first introduced in the "v0.5.7" release.
+
+  udpsock:close
+    syntax: *ok, err = udpsock:close()*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Closes the current UDP or datagram unix domain socket. It returns the 1
+    in case of success and returns "nil" with a string describing the error
+    otherwise.
+
+    Socket objects that have not invoked this method (and associated
+    connections) will be closed when the socket object is released by the
+    Lua GC (Garbage Collector) or the current client HTTP request finishes
+    processing.
+
+    This feature was first introduced in the "v0.5.7" release.
+
+  udpsock:settimeout
+    syntax: *udpsock:settimeout(time)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Set the timeout value in milliseconds for subsequent socket operations
+    (like receive).
+
+    Settings done by this method takes priority over those config
+    directives, like lua_socket_read_timeout.
+
+    This feature was first introduced in the "v0.5.7" release.
 
   ngx.socket.tcp
     syntax: *tcpsock = ngx.socket.tcp()*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-    Creates and returns a TCP (or Unix Domain) socket object (also known as
-    the "cosocket" object). The following methods are supported on this
-    object:
+    Creates and returns a TCP or stream-oriented unix domain socket object
+    (also known as one type of the "cosocket" objects). The following
+    methods are supported on this object:
 
     *   connect
 
@@ -3388,15 +4253,18 @@ Nginx API for Lua
 
     This feature was first introduced in the "v0.5.0rc1" release.
 
-  tcpsock:connect
-    syntax: *ok, err = tcpsock:connect(host, port)*
+    See also ngx.socket.udp.
 
-    syntax: *ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket")*
+  tcpsock:connect
+    syntax: *ok, err = tcpsock:connect(host, port, options_table?)*
+
+    syntax: *ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket",
+    options_table?)*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-    Attempts to connect a TCP socket object to a remote server or to a unix
-    domain socket file nonblockingly.
+    Attempts to connect a TCP socket object to a remote server or to a
+    stream unix domain socket file without blocking.
 
     Before actually resolving the host name and connecting to the remote
     backend, this method will always look up the connection pool for matched
@@ -3405,8 +4273,8 @@ Nginx API for Lua
 
     Both IP addresses and domain names can be specified as the "host"
     argument. In case of domain names, this method will use Nginx core's
-    dynamic resolver to parse the domain name nonblockingly and it is
-    required to configure the resolver directive in your "nginx.conf" file
+    dynamic resolver to parse the domain name without blocking and it is
+    required to configure the resolver directive in the "nginx.conf" file
     like this:
 
         resolver 8.8.8.8;  # use Google's public DNS nameserver
@@ -3443,8 +4311,8 @@ Nginx API for Lua
             return
         end
 
-    assuming that your memcached (or something else) is listening on the
-    unix domain socket file "/tmp/memcached.sock".
+    assuming memcached (or something else) is listening on the unix domain
+    socket file "/tmp/memcached.sock".
 
     Timeout for the connecting operation is controlled by the
     lua_socket_connect_timeout config directive and the settimeout method.
@@ -3460,14 +4328,24 @@ Nginx API for Lua
     Calling this method on an already connected socket object will cause the
     original connection to be closed first.
 
-    This feature was first introduced in the "v0.5.0rc1" release.
+    An optional Lua table can be specified as the last argument to this
+    method to specify various connect options:
+
+    *   "pool" specify a custom name for the connection pool being used. If
+        omitted, then the connection pool name will be generated from the
+        string template "<host>:<port>" or "<unix-socket-path>".
+
+    The support for the options table argument was first introduced in the
+    "v0.5.7" release.
+
+    This method was first introduced in the "v0.5.0rc1" release.
 
   tcpsock:send
     syntax: *bytes, err = tcpsock:send(data)*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-    Sends data nonblockingly on the current TCP or Unix Domain Socket
+    Sends data without blocking on the current TCP or Unix Domain Socket
     connection.
 
     This method is a synchronous operation that will not return until *all*
@@ -3477,11 +4355,11 @@ Nginx API for Lua
     In case of success, it returns the total number of bytes that have been
     sent. Otherwise, it returns "nil" and a string describing the error.
 
-    The input argument `data` can either be a Lua string or a (nested) Lua
+    The input argument "data" can either be a Lua string or a (nested) Lua
     table holding string fragments. In case of table arguments, this method
-    will automatically copy all the string elements piece by piece to the
-    underlying Nginx socket send buffers, which is usually optimal than
-    doing string concatenation operations on the Lua land.
+    will copy all the string elements piece by piece to the underlying Nginx
+    socket send buffers, which is usually optimal than doing string
+    concatenation operations on the Lua land.
 
     Timeout for the sending operation is controlled by the
     lua_socket_send_timeout config directive and the settimeout method. And
@@ -3549,7 +4427,7 @@ Nginx API for Lua
     This feature was first introduced in the "v0.5.0rc1" release.
 
   tcpsock:receiveuntil
-    syntax: *iterator = tcpsock:receiveuntil(pattern)*
+    syntax: *iterator = tcpsock:receiveuntil(pattern, options?)*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
@@ -3582,12 +4460,12 @@ Nginx API for Lua
 
     The iterator function behaves differently (i.e., like a real iterator)
     when it is called with a "size" argument. That is, it will read that
-    "size" of data at earch invocation and will return "nil" at the last
+    "size" of data on each invocation and will return "nil" at the last
     invocation (either sees the boundary pattern or meets an error). For the
     last successful invocation of the iterator function, the "err" return
-    value will be "nil" too. The iterator function will automatically reset
-    after its last successful invocation that returns "nil" data and "nil"
-    error. Consider the following example:
+    value will be "nil" too. The iterator function will be reset after the
+    last successful invocation that returns "nil" data and "nil" error.
+    Consider the following example:
 
         local reader = sock:receiveuntil("\r\n--abcedhb")
 
@@ -3618,7 +4496,7 @@ Nginx API for Lua
         read done
 
     Note that, the actual data returned *might* be a little longer than the
-    size limit specified by the "size" argument when your boundary pattern
+    size limit specified by the "size" argument when the boundary pattern
     has ambiguity for streaming parsing. Near the boundary of the data
     stream, the data string actually returned could also be shorter than the
     size limit.
@@ -3641,26 +4519,44 @@ Nginx API for Lua
     iterator function (note that the "receiveuntil" call is irrelevant
     here).
 
-    This feature was first introduced in the "v0.5.0rc1" release.
+    As from the "v0.5.1" release, this method also takes an optional
+    "options" table argument to control the behavior. The following options
+    are supported:
+
+    *   "inclusive"
+
+    The "inclusive" takes a boolean value to control whether to include the
+    pattern string in the returned data string. Default to "false". For
+    example,
+
+        local reader = tcpsock:receiveuntil("_END_", { inclusive = true })
+        local data = reader()
+        ngx.say(data)
+
+    Then for the input data stream "hello world _END_ blah blah blah", then
+    the example above will output "hello world _END_", including the pattern
+    string "_END_" itself.
+
+    This method was first introduced in the "v0.5.0rc1" release.
 
   tcpsock:close
     syntax: *ok, err = tcpsock:close()*
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-    Closes the current TCP or Unix Domain socket. It returns the 1 in case
-    of success and returns "nil" with a string describing the error
+    Closes the current TCP or stream unix domain socket. It returns the 1 in
+    case of success and returns "nil" with a string describing the error
     otherwise.
 
-    For socket objects that have invoked the setkeepalive method, there is
-    no need to call this method on it because the socket object is already
-    closed (and the current connection is saved into the builtin connection
-    pool).
+    Note that there is no need to call this method on socket objects that
+    have invoked the setkeepalive method because the socket object is
+    already closed (and the current connection is saved into the built-in
+    connection pool).
 
-    For socket objects that have not invoked setkeepalive, they (and their
-    connections) will be automatically closed when the socket object is
-    released by the Lua GC (Garbage Collector) or the current client HTTP
-    request finishes processing.
+    Socket objects that have not invoked this method (and associated
+    connections) will be closed when the socket object is released by the
+    Lua GC (Garbage Collector) or the current client HTTP request finishes
+    processing.
 
     This feature was first introduced in the "v0.5.0rc1" release.
 
@@ -3699,9 +4595,9 @@ Nginx API for Lua
 
     context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-    Puts the current socket's connection into the cosocket built-in
-    connection pool and keep it alive until other connect method calls
-    request it or the associated maximal idle timeout is expired.
+    Puts the current socket's connection immediately into the cosocket
+    built-in connection pool and keep it alive until other connect method
+    calls request it or the associated maximal idle timeout is expired.
 
     The first optional argument, "timeout", can be used to specify the
     maximal idle timeout (in milliseconds) for the current connection. If
@@ -3716,9 +4612,9 @@ Nginx API for Lua
     the pool is created. When this argument is omitted, the default setting
     in the lua_socket_pool_size config directive will be used.
 
-    When the connection pool is exceeding the size limit, the least recently
-    used (idle) connection already in the pool will be closed automatically
-    to make room for the current connection.
+    When the connection pool exceeds the available size limit, the least
+    recently used (idle) connection already in the pool will be closed to
+    make room for the current connection.
 
     Note that the cosocket connection pool is per Nginx worker process
     rather than per Nginx server instance, so the size limit specified here
@@ -3733,7 +4629,7 @@ Nginx API for Lua
     and a string describing the error.
 
     This method also makes the current cosocket object enter the "closed"
-    state, so you do not need to manually call the close method on it
+    state, so there is no need to manually call the close method on it
     afterwards.
 
     This feature was first introduced in the "v0.5.0rc1" release.
@@ -3775,16 +4671,440 @@ Nginx API for Lua
         return sock
 
     There is no way to use the settimeout method to specify connecting
-    timeout for this method. You have to use the lua_socket_connect_timeout
-    directive at configure time instead.
+    timeout for this method and the lua_socket_connect_timeout directive
+    must be set at configure time instead.
 
     This feature was first introduced in the "v0.5.0rc1" release.
 
+  ngx.get_phase
+    syntax: *str = ngx.get_phase()*
+
+    context: *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*,
+    content_by_lua*, header_filter_by_lua*, body_filter_by_lua*,
+    log_by_lua**
+
+    Retrieves the current running phase name. Possible return values are
+
+    *   "init" for the context of init_by_lua or init_by_lua_file. =item *
+
+        "set" for the context of set_by_lua or set_by_lua_file. =item *
+
+        "rewrite" for the context of rewrite_by_lua or rewrite_by_lua_file.
+        =item *
+
+        "access" for the context of access_by_lua or access_by_lua_file.
+        =item *
+
+        "content" for the context of content_by_lua or content_by_lua_file.
+        =item *
+
+        "header_filter" for the context of header_filter_by_lua or
+        header_filter_by_lua_file. =item *
+
+        "body_filter" for the context of body_filter_by_lua or
+        body_filter_by_lua_file. =item *
+
+        "log" for the context of log_by_lua or log_by_lua_file.
+
+    This API was first introduced in the "v0.5.10" release.
+
+  coroutine.create
+    syntax: *co = coroutine.create(f)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Creates a user Lua coroutines with a Lua function, and returns a
+    coroutine object.
+
+    Similar to the standard Lua coroutine.create
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.create>) API,
+    but works in the context of the Lua coroutines created by ngx_lua.
+
+    This API was first introduced in the "v0.6.0" release.
+
+  coroutine.resume
+    syntax: *ok, ... = coroutine.resume(co, ...)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Resumes the executation of a user Lua coroutine object previously
+    yielded or just created.
+
+    Similar to the standard Lua coroutine.resume
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.resume>) API,
+    but works in the context of the Lua coroutines created by ngx_lua.
+
+    This API was first introduced in the "v0.6.0" release.
+
+  coroutine.yield
+    syntax: *... = coroutine.yield(co, ...)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Yields the executation of the current user Lua coroutine.
+
+    Similar to the standard Lua coroutine.yield
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.yield>) API,
+    but works in the context of the Lua coroutines created by ngx_lua.
+
+    This API was first introduced in the "v0.6.0" release.
+
+  coroutine.wrap
+    syntax: *co = coroutine.wrap(f)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Similar to the standard Lua coroutine.wrap
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.wrap>) API,
+    but works in the context of the Lua coroutines created by ngx_lua.
+
+    This API was first introduced in the "v0.6.0" release.
+
+  coroutine.running
+    syntax: *co = coroutine.running()*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Identical to the standard Lua coroutine.running
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running>) API.
+
+    This API was first enabled in the "v0.6.0" release.
+
+  coroutine.status
+    syntax: *status = coroutine.status(co)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Identical to the standard Lua coroutine.status
+    (<http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status>) API.
+
+    This API was first enabled in the "v0.6.0" release.
+
+  ngx.thread.spawn
+    syntax: *co = ngx.thread.spawn(func, arg1, arg2, ...)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Spawns a new user "light thread" with the Lua function "func" as well as
+    those optional arguments "arg1", "arg2", and etc. Returns a Lua thread
+    (or Lua coroutine) object represents this "light thread".
+
+    "Light threads" are just a special kind of Lua coroutines that are
+    scheduled by the ngx_lua module.
+
+    Before "ngx.thread.spawn" returns, the "func" will be called with those
+    optional arguments until it returns, aborts with an error, or gets
+    yielded due to I/O operations via the Nginx API for Lua (like
+    <tcpsock:receive|/"tcpsock:receive">).
+
+    After "ngx.thread.spawn" returns, the newly-created "light thread" will
+    keep running asynchronously usually at various I/O events.
+
+    All the Lua code chunks running by rewrite_by_lua, access_by_lua, and
+    content_by_lua are in a boilerplate "light thread" created automatically
+    by ngx_lua. Such boilerplate "light thread" are also called "entry
+    threads".
+
+    By default, the corresponding Nginx handler (e.g., rewrite_by_lua
+    handler) will not terminate until
+
+    1.  both the "entry thread" and all the user "light threads" terminates,
+
+    2.  a "light thread" (either the "entry thread" or a user "light thread"
+        aborts by calling ngx.exit, ngx.exec, ngx.redirect, or
+        ngx.req.set_uri(uri, true), or
+
+    3.  the "entry thread" terminates with a Lua error.
+
+    When the user "light thread" terminates with a Lua error, however, it
+    will not abort other running "light threads" like the "entry thread"
+    does.
+
+    Due to the limitation in the Nginx subrequest model, it is not allowed
+    to abort a running Nginx subrequest in general. So it is also prohibited
+    to abort a running "light thread" that is pending on one ore more Nginx
+    subrequests. You must call ngx.thread.wait to wait for those "light
+    thread" to terminate before quitting the "world". A notable exception
+    here is that you can abort pending subrequests by calling ngx.exit with
+    and only with the status code "ngx.ERROR" (-1), 408, 444, or 499.
+
+    The "light threads" are not scheduled in a pre-emptive way. In other
+    words, no time-slicing is performed automatically. A "light thread" will
+    keep running exclusively on the CPU until
+
+    1.  a (nonblocking) I/O operation cannot be completed in a single run,
+
+    2.  it calls coroutine.yield to actively give up execution, or
+
+    3.  it is aborted by a Lua error or an invocation of ngx.exit, ngx.exec,
+        ngx.redirect, or ngx.req.set_uri(uri, true).
+
+    For the first two cases, the "light thread" will usually be resumed
+    later by the ngx_lua scheduler unless a "stop-the-world" event happens.
+
+    User "light threads" can create "light threads" themselves and normal
+    user coroutiens created by coroutine.create can also create "light
+    threads". The coroutine (be it a normal Lua coroutine or a "light
+    thread") that directly spawns the "light thread" is called the "parent
+    coroutine" for the "light thread" newly spawned.
+
+    The "parent coroutine" can call ngx.thread.wait to wait on the
+    termination of its child "light thread".
+
+    You can call coroutine.status() and coroutine.yield() on the "light
+    thread" coroutines.
+
+    The status of the "light thread" coroutine can be "zombie" if
+
+    1.  the current "light thread" already terminates (either successfully
+        or with an error),
+
+    2.  its parent coroutine is still alive, and
+
+    3.  its parent coroutine is not waiting on it with ngx.thread.wait.
+
+    The following example demonstrates the use of coroutine.yield() in the
+    "light thread" coroutines to do manual time-slicing:
+
+        local yield = coroutine.yield
+
+        function f()
+            local self = coroutine.running()
+            ngx.say("f 1")
+            yield(self)
+            ngx.say("f 2")
+            yield(self)
+            ngx.say("f 3")
+        end
+
+        local self = coroutine.running()
+        ngx.say("0")
+        yield(self)
+
+        ngx.say("1")
+        ngx.thread.spawn(f)
+
+        ngx.say("2")
+        yield(self)
+
+        ngx.say("3")
+        yield(self)
+
+        ngx.say("4")
+
+    Then it will generate the output
+
+        0
+        1
+        f 1
+        2
+        f 2
+        3
+        f 3
+        4
+
+    "Light threads" are mostly useful for doing concurrent upstream requests
+    in a single Nginx request handler, kinda like a generalized version of
+    ngx.location.capture_multi that can work with all the Nginx API for Lua.
+    The following example demonstrates parallel requests to MySQL,
+    Memcached, and upstream HTTP services in a single Lua handler, and
+    outputting the results in the order that they actually return (very much
+    like the Facebook BigPipe model):
+
+        -- query mysql, memcached, and a remote http service at the same time,
+        -- output the results in the order that they
+        -- actually return the results.
+
+        local mysql = require "resty.mysql"
+        local memcached = require "resty.memcached"
+
+        local function query_mysql()
+            local db = mysql:new()
+            db:connect{
+                        host = "127.0.0.1",
+                        port = 3306,
+                        database = "test",
+                        user = "monty",
+                        password = "mypass"
+                      }
+            local res, err, errno, sqlstate =
+                    db:query("select * from cats order by id asc")
+            db:set_keepalive(0, 100)
+            ngx.say("mysql done: ", cjson.encode(res))
+        end
+
+        local function query_memcached()
+            local memc = memcached:new()
+            memc:connect("127.0.0.1", 11211)
+            local res, err = memc:get("some_key")
+            ngx.say("memcached done: ", res)
+        end
+
+        local function query_http()
+            local res = ngx.location.capture("/my-http-proxy")
+            ngx.say("http done: ", res.body)
+        end
+
+        ngx.thread.spawn(query_mysql)      -- create thread 1
+        ngx.thread.spawn(query_memcached)  -- create thread 2
+        ngx.thread.spawn(query_http)       -- create thread 3
+
+    This API was first enabled in the "v0.7.0" release.
+
+  ngx.thread.wait
+    syntax: *ok, res1, res2, ... = ngx.thread.wait(thread1, thread2, ...)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Waits on one or more child "light threads" and returns the results of
+    the first "light thread" that terminates (either successfully or with an
+    error).
+
+    The arguments "thread1", "thread2", and etc are the Lua thread objects
+    returned by earlier calls of ngx.thread.spawn.
+
+    The return values have exactly the same meaning as coroutine.resume,
+    that is, the first value returned is a boolean value indicating whether
+    the "light thread" terminates successfully or not, and subsequent values
+    returned are the return values of the user Lua function that was used to
+    spawn the "light thread" (in case of success) or the error object (in
+    case of failure).
+
+    Only the direct "parent coroutine" can wait on its child "light thread",
+    otherwise a Lua exception will be raised.
+
+    The following example demonstrates the use of "ngx.thread.wait" and
+    ngx.location.capture to emulate ngx.location.capture_multi:
+
+        local capture = ngx.location.capture
+        local spawn = ngx.thread.spawn
+        local wait = ngx.thread.wait
+        local say = ngx.say
+
+        local function fetch(uri)
+            return capture(uri)
+        end
+
+        local threads = {
+            spawn(fetch, "/foo"),
+            spawn(fetch, "/bar"),
+            spawn(fetch, "/baz")
+        }
+
+        for i = 1, #threads do
+            local ok, res = wait(threads[i])
+            if not ok then
+                say(i, ": failed to run: ", res)
+            else
+                say(i, ": status: ", res.status)
+                say(i, ": body: ", res.body)
+            end
+        end
+
+    Here it essentially implements the "wait all" model.
+
+    And below is an example demonstrating the "wait any" model:
+
+        function f()
+            ngx.sleep(0.2)
+            ngx.say("f: hello")
+            return "f done"
+        end
+
+        function g()
+            ngx.sleep(0.1)
+            ngx.say("g: hello")
+            return "g done"
+        end
+
+        local tf, err = ngx.thread.spawn(f)
+        if not tf then
+            ngx.say("failed to spawn thread f: ", err)
+            return
+        end
+
+        ngx.say("f thread created: ", coroutine.status(tf))
+
+        local tg, err = ngx.thread.spawn(g)
+        if not tg then
+            ngx.say("failed to spawn thread g: ", err)
+            return
+        end
+
+        ngx.say("g thread created: ", coroutine.status(tg))
+
+        ok, res = ngx.thread.wait(tf, tg)
+        if not ok then
+            ngx.say("failed to wait: ", res)
+            return
+        end
+
+        ngx.say("res: ", res)
+
+        -- stop the "world", aborting other running threads
+        ngx.exit(ngx.OK)
+
+    And it will generate the following output:
+
+        f thread created: running
+        g thread created: running
+        g: hello
+        res: g done
+
+    This API was first enabled in the "v0.7.0" release.
+
+  ngx.on_abort
+    syntax: *ok, err = ngx.on_abort(callback)*
+
+    context: *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+    Registers a user Lua function as the callback which gets called
+    automatically when the client closes the (downstream) connection
+    prematurely.
+
+    Returns 1 if the callback is registered successfully or returns "nil"
+    and a string describing the error otherwise.
+
+    All the Nginx API for Lua can be used in the callback function because
+    the function is run in a special "light thread", just as those "light
+    threads" created by ngx.thread.spawn.
+
+    The callback function can decide what to do with the client abortion
+    event all by itself. For example, it can simply ignore the event by
+    doing nothing and the current Lua request handler will continue
+    executing without interruptions. And the callback function can also
+    decide to terminate everything by calling ngx.exit, for example,
+
+        local function my_cleanup()
+            -- custom cleanup work goes here, like cancelling a pending DB transaction
+
+            -- now abort all the "light threads" running in the current request handler
+            ngx.exit(499)
+        end
+
+        local ok, err = ngx.on_abort(my_cleanup)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to register the on_abort callback: ", err)
+            ngx.exit(500)
+        end
+
+    When lua_check_client_abort is set to "off" (which is the default), then
+    this function call will always return the error message
+    "lua_check_client_abort is off".
+
+    According to the current implementation, this function can only be
+    called once in a single request handler; subsequent calls will return
+    the error message "duplicate call".
+
+    This API was first introduced in the "v0.7.4" release.
+
+    See also lua_check_client_abort.
+
   ndk.set_var.DIRECTIVE
     syntax: *res = ndk.set_var.DIRECTIVE_NAME*
 
     context: *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*,
-    header_filter_by_lua**
+    header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
     This mechanism allows calling other nginx C modules' directives that are
     implemented by Nginx Devel Kit
@@ -3835,36 +5155,70 @@ Nginx API for Lua
     This feature requires the ngx_devel_kit
     (<https://github.com/simpl/ngx_devel_kit>) module.
 
-HTTP 1.0 support
-    The HTTP 1.0 protocol does not support chunked outputs and always
-    requires an explicit "Content-Length" header when the response body is
-    non-empty in order to support the HTTP 1.0 keep-alive (as required by
-    the ApacheBench (ab) tool). So when an HTTP 1.0 request is present and
-    the lua_http10_buffering directive is turned "on", this module will
-    automatically buffer all the outputs of user calls of ngx.say and
-    ngx.print and postpone sending response headers until it sees all the
-    outputs in the response body, and at that time ngx_lua can calculate the
-    total length of the body and construct a proper "Content-Length" header
-    for the HTTP 1.0 client.
+Lua/LuaJIT bytecode support
+    As from the "v0.5.0rc32" release, all *_by_lua_file configure directives
+    (such as content_by_lua_file) support loading Lua 5.1 and LuaJIT 2.0 raw
+    bytecode files directly.
 
-    If the user Lua code sets the "Content-Length" response header itself,
-    then the automatic buffering will be disabled even if the
+    Please note that the bytecode format used by LuaJIT 2.0 is not
+    compatible with that used by the standard Lua 5.1 interpreter. So if
+    using LuaJIT 2.0 with ngx_lua, LuaJIT compatible bytecode files must be
+    generated as shown:
+
+        /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.luac
+
+    The "-bg" option can be used to include debug information in the LuaJIT
+    bytecode file:
+
+        /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.luac
+
+    Please refer to the official LuaJIT documentation on the "-b" option for
+    more details:
+
+    http://luajit.org/running.html#opt_b
+
+    Similarly, if using the standard Lua 5.1 interpreter with ngx_lua, Lua
+    compatible bytecode files must be generated using the "luac" commandline
+    utility as shown:
+
+        luac -o /path/to/output_file.luac /path/to/input_file.lua
+
+    Unlike as with LuaJIT, debug information is included in standard Lua 5.1
+    bytecode files by default. This can be striped out by specifying the
+    "-s" option as shown:
+
+        luac -s -o /path/to/output_file.luac /path/to/input_file.lua
+
+    Attempts to load standard Lua 5.1 bytecode files into ngx_lua instances
+    linked to LuaJIT 2.0 or vice versa, will result in an error message,
+    such as that below, being logged into the Nginx "error.log" file:
+
+        [error] 13909#0: *1 failed to load Lua inlined code: bad byte-code header in /path/to/test_file.luac
+
+    Loading bytecode files via the Lua primitives like "require" and
+    "dofile" should always work as expected.
+
+HTTP 1.0 support
+    The HTTP 1.0 protocol does not support chunked output and requires an
+    explicit "Content-Length" header when the response body is not empty in
+    order to support the HTTP 1.0 keep-alive. So when a HTTP 1.0 request is
+    made and the lua_http10_buffering directive is turned "on", ngx_lua will
+    buffer the output of ngx.say and ngx.print calls and also postpone
+    sending response headers until all the response body output is received.
+    At that time ngx_lua can calculate the total length of the body and
+    construct a proper "Content-Length" header to return to the HTTP 1.0
+    client. If the "Content-Length" response header is set in the running
+    Lua code, however, this buffering will be disabled even if the
     lua_http10_buffering directive is turned "on".
 
-    For big responses' streaming outputs, it's important to disable the
-    lua_http10_buffering directive, otherwise the memory usage will grow
-    very quickly.
+    For large streaming output responses, it is important to disable the
+    lua_http10_buffering directive to minimise memory usage.
 
-    Note that, common HTTP benchmark tools like "ab" and "http_load" always
-    issue HTTP 1.0 requests by default. To force "curl" to send HTTP 1.0
-    requests, use the -0 option.
+    Note that common HTTP benchmark tools such as "ab" and "http_load" issue
+    HTTP 1.0 requests by default. To force "curl" to send HTTP 1.0 requests,
+    use the -0 option.
 
 Data Sharing within an Nginx Worker
-    NOTE: This mechanism behaves differently when code cache is turned off
-    and should be considered a DIRTY TRICK. Note that backward compatibility
-    is NOT guaranteed and that there may be other undesirable consequences.
-    A new data sharing mechanism will be designed later.
-
     To globally share data among all the requests handled by the same nginx
     worker process, encapsulate the shared data into a Lua module, use the
     Lua "require" builtin to import the module, and then manipulate the
@@ -3876,7 +5230,7 @@ Data Sharing within an Nginx Worker
     Here is a complete small example:
 
         -- mydata.lua
-        module("mydata", package.seeall)
+        module(...)
 
         local data = {
             dog = 3,
@@ -3891,8 +5245,8 @@ Data Sharing within an Nginx Worker
     and then accessing it from "nginx.conf":
 
         location /lua {
-            content_lua_by_lua '
-                local mydata = require("mydata")
+            content_by_lua '
+                local mydata = require "mydata"
                 ngx.say(mydata.get_age("dog"))
             ';
         }
@@ -3906,27 +5260,37 @@ Data Sharing within an Nginx Worker
     this module.
 
     Note that this data sharing is on a *per-worker* basis and not on a
-    ''per-server' basis'. That is, when there are multiple nginx worker
+    *per-server* basis. That is, when there are multiple nginx worker
     processes under an Nginx master, data sharing cannot cross the process
     boundary between these workers.
 
-    If server wide data sharing is required:
+    If server-wide data sharing is required, then use one or more of the
+    following approaches:
 
-    1.  Use the ngx.shared.DICT API provied by this module.
+    1.  Use the ngx.shared.DICT API provided by this module.
 
-    2.  Use only a single nginx worker and a single server. This is however
+    2.  Use only a single nginx worker and a single server (this is however
         not recommended when there is a multi core CPU or multiple CPUs in a
-        single machine.
+        single machine).
 
     3.  Use data storage mechanisms such as "memcached", "redis", "MySQL" or
         "PostgreSQL". The ngx_openresty bundle (<http://openresty.org>)
         associated with this module comes with a set of companion Nginx
-        modules that provide interfaces with these data storage mechanisms.
-        See the [[HttpMemcModule]], [[HttpRedis2Module]],
-        [[HttpDrizzleModule]] and HttpPostgresModule
-        (<http://github.com/FRiCKLE/ngx_postgres/>) modules for details
+        modules and Lua libraries that provide interfaces with these data
+        storage mechanisms.
 
 Known Issues
+  TCP socket connect operation issues
+    The <tcpsock:connect|/"tcpsock:connect"> method may indicate "success"
+    despite connection failures such as with "Connection Refused" errors.
+
+    However, later attempts to manipulate the cosocket object will fail and
+    return the actual error status message generated by the failed connect
+    operation.
+
+    This issue is due to limitations in the Nginx event model and only
+    appears to affect Mac OS X.
+
   Lua Coroutine Yielding/Resuming
     *   As the module's predefined Nginx I/O API uses the coroutine
         yielding/resuming mechanism, user code should not call any Lua
@@ -3943,16 +5307,16 @@ Known Issues
         5.1 and LuaJIT 2.0 and when ngx.location.capture is called,
         ngx.exec, ngx.exit or ngx.req.read_body or similar in the file to be
         loaded by "dofile", a coroutine yield across the C function boundary
-        will be initiated. This however is not allowed within ngx_lua and
-        will usually result in error messages like "lua handler aborted:
-        runtime error: attempt to yield across C-call boundary". To avoid
-        this, define a real Lua module and use the Lua "require" builtin
-        instead.
+        will be initiated. This however is not normally allowed within
+        ngx_lua and will usually result in error messages like "lua handler
+        aborted: runtime error: attempt to yield across C-call boundary". To
+        avoid this, define a real Lua module and use the Lua "require"
+        builtin instead.
 
-    *   Because the standard Lua 5.1 interpreter's VM is not fully
-        resumable, the methods ngx.location.capture,
-        ngx.location.capture_multi, ngx.redirect, ngx.exec, and ngx.exit
-        cannot be used within the context of a Lua pcall()
+    *   As the standard Lua 5.1 interpreter's VM is not fully resumable, the
+        methods ngx.location.capture, ngx.location.capture_multi,
+        ngx.redirect, ngx.exec, and ngx.exit cannot be used within the
+        context of a Lua pcall()
         (<http://www.lua.org/manual/5.1/manual.html#pdf-pcall>) or xpcall()
         (<http://www.lua.org/manual/5.1/manual.html#pdf-xpcall>) when the
         standard Lua 5.1 interpreter is used and the "attempt to yield
@@ -3963,7 +5327,7 @@ Known Issues
     Care should be taken when importing modules and this form should be
     used:
 
-            local xxx = require('xxx')
+        local xxx = require('xxx')
 
     instead of the old deprecated form: require('xxx')
 
@@ -3972,19 +5336,21 @@ Known Issues
     require('xxx')
 
     It is recommended to always place the following piece of code at the end
-    of Lua modules that use the ngx.location.capture or
-    ngx.location.capture_multi directives to prevent casual use of
+    of Lua modules that use the I/O operations to prevent casual use of
     module-level global variables that are shared among *all* requests:
 
-        getmetatable(foo.bar).__newindex = function (table, key, val)
-            error('Attempt to write to undeclared variable "' .. key .. '": '
-                    .. debug.traceback())
-        end
+        local class_mt = {
+            -- to prevent use of casual module global variables
+            __newindex = function (table, key, val)
+                error('attempt to write to undeclared variable "' .. key .. '"')
+            end
+        }
+        setmetatable(_M, class_mt)
 
-    Assuming the current Lua module is named "foo.bar", this will guarantee
-    that local variables in module "foo.bar" functions have been declared as
-    "local". It prevents undesirable race conditions while accessing such
-    variables. See Data Sharing within an Nginx Worker for the reasons
+    This will guarantee that local variables in the Lua module functions are
+    all declared with the "local" keyword, otherwise a runtime exception
+    will be thrown. It prevents undesirable race conditions while accessing
+    such variables. See Data Sharing within an Nginx Worker for the reasons
     behind this.
 
   Locations Configured by Subrequest Directives of Other Modules
@@ -3995,7 +5361,7 @@ Known Issues
 
         location /foo {
             content_by_lua '
-                res = ngx.location.capature("/bar")
+                res = ngx.location.capture("/bar")
             ';
         }
         location /bar {
@@ -4061,14 +5427,12 @@ Known Issues
 
     Note that a longer from of the long bracket, "[=[...]=]", may be
     required if the regex pattern contains "[...]" sequences. The
-    "[=[...]=]" form may be used as the default form if desired and it may
-    help with readability if a space is inserted between the long brackets
-    and the regex patterns.
+    "[=[...]=]" form may be used as the default form if desired.
 
         # nginx.conf
         location /test {
             content_by_lua '
-                local regex = [=[ [0-9]+ ]=]
+                local regex = [=[[0-9]+]=]
                 local m = ngx.re.match("hello, 1234", regex)
                 if m then ngx.say(m[0]) else ngx.say("not matched!") end
             ';
@@ -4131,31 +5495,28 @@ Typical Uses
     this performance level.
 
     The Lua state (Lua VM instance) is shared across all the requests
-    handled by a single nginx worker process to miminize memory use.
+    handled by a single nginx worker process to minimize memory use.
 
-    On a ThinkPad T400 2.80 GHz laptop, the HelloWorld example readily
+    On a ThinkPad T400 2.80 GHz laptop, the Hello World example readily
     achieves 28k req/sec using "http_load -p 10". By contrast, Nginx +
     php-fpm 5.2.8 + Unix Domain Socket yields 6k req/sec and Node.js
-    (<http://nodejs.org/>) v0.6.1 yields 10.2k req/sec for their HelloWorld
+    (<http://nodejs.org/>) v0.6.1 yields 10.2k req/sec for their Hello World
     equivalents.
 
-    This module performs best when built with LuaJIT 2.0
-    (<http://luajit.org/luajit.html>).
-
 Nginx Compatibility
     The module is compatible with the following versions of Nginx:
 
-    *
-          1.1.x (last tested: 1.1.5)
+    *   1.3.x (last tested: 1.3.7)
 
-    *
-          1.0.x (last tested: 1.0.15)
+    *   1.2.x (last tested: 1.2.4)
 
-    *
-          0.9.x (last tested: 0.9.4)
+    *   1.1.x (last tested: 1.1.5)
 
-    *
-          0.8.x >= 0.8.54 (last tested: 0.8.54)
+    *   1.0.x (last tested: 1.0.15)
+
+    *   0.9.x (last tested: 0.9.4)
+
+    *   0.8.x >= 0.8.54 (last tested: 0.8.54)
 
 Code Repository
     The code repository of this project is hosted on github at
@@ -4164,23 +5525,23 @@ Code Repository
 
 Installation
     The ngx_openresty bundle (<http://openresty.org>) can be used to install
-    Nginx, "ngx_lua", either one of the standard Lua 5.1 interpreter or
-    LuaJIT 2.0, as well as a package of powerful companion Nginx modules.
-    The basic installation step is a simple "./configure --with-luajit &&
-    make && make install".
+    Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT
+    2.0, as well as a package of powerful companion Nginx modules. The basic
+    installation step is a simple "./configure --with-luajit && make && make
+    install".
 
-    Alternatively, "ngx_lua" can be manually compiled into Nginx:
+    Alternatively, ngx_lua can be manually compiled into Nginx:
 
     1.  Install LuaJIT 2.0 (Recommended) or Lua 5.1 (Lua 5.2 is *not*
-        supported yet). Lua can be obtained free from the the LuaJIT
-        download page (<http://luajit.org/download.html>) or the standard
-        Lua homepage (<http://www.lua.org/>). Some distribution package
-        managers also distribute Lua and LuaJIT.
+        supported yet). LuajIT can be downloaded from the the LuaJIT project
+        website (<http://luajit.org/download.html>) and Lua 5.1, from the
+        Lua project website (<http://www.lua.org/>). Some distribution
+        package managers also distribute LuajIT and/or Lua.
 
     2.  Download the latest version of the ngx_devel_kit (NDK) module HERE
         (<http://github.com/simpl/ngx_devel_kit/tags>).
 
-    3.  Download the latest version of this module HERE
+    3.  Download the latest version of ngx_lua HERE
         (<http://github.com/chaoslawful/lua-nginx-module/tags>).
 
     4.  Download the latest version of Nginx HERE (<http://nginx.org/>) (See
@@ -4188,17 +5549,17 @@ Installation
 
     Build the source with this module:
 
-        wget 'http://nginx.org/download/nginx-1.0.15.tar.gz'
-        tar -xzvf nginx-1.0.15.tar.gz
-        cd nginx-1.0.15/
+        wget 'http://nginx.org/download/nginx-1.2.4.tar.gz'
+        tar -xzvf nginx-1.2.4.tar.gz
+        cd nginx-1.2.4/
 
-        # tell nginx's build system where to find lua:
-        export LUA_LIB=/path/to/lua/lib
-        export LUA_INC=/path/to/lua/include
+        # tell nginx's build system where to find LuaJIT:
+        export LUAJIT_LIB=/path/to/luajit/lib
+        export LUAJIT_INC=/path/to/luajit/include/luajit-2.0
 
-        # or tell where to find LuaJIT when if using JIT instead
-        # export LUAJIT_LIB=/path/to/luajit/lib
-        # export LUAJIT_INC=/path/to/luajit/include/luajit-2.0
+        # or tell where to find Lua if using Lua instead:
+        #export LUA_LIB=/path/to/lua/lib
+        #export LUA_INC=/path/to/lua/include
 
         # Here we assume Nginx is to be installed under /opt/nginx/.
         ./configure --prefix=/opt/nginx \
@@ -4208,33 +5569,54 @@ Installation
         make -j2
         make install
 
+  Installation on Ubuntu 11.10
+    Note that it is recommended to use LuaJIT 2.0 instead of the standard
+    Lua 5.1 interpreter where possible.
+
+    If the standard Lua 5.1 interpreter is required however, run the
+    following command to install it from the Ubuntu repository:
+
+    apt-get install -y lua5.1 liblua5.1-0 liblua5.1-0-dev
+
+    Everything should be installed correctly, except for one small tweak.
+
+    Library name "liblua.so" has been changed in liblua5.1 package, it only
+    comes with "liblua5.1.so", which needs to be symlinked to "/usr/lib" so
+    it could be found during the configuration process.
+
+    ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
+
+Community
+  English Mailing List
+    The openresty-en (<https://groups.google.com/group/openresty-en>)
+    mailing list is for English speakers.
+
+  Chinese Mailing List
+    The openresty (<https://groups.google.com/group/openresty>) mailing list
+    is for Chinese speakers.
+
 Bugs and Patches
-    Please report bugs or submit patches by:
+    Please submit bug reports, wishlists, or patches by
 
-    1.  Creating a ticket on the GitHub Issue Tracker
-        (<http://github.com/chaoslawful/lua-nginx-module/issues>)
-        (Recommended)
+    1.  creating a ticket on the GitHub Issue Tracker
+        (<http://github.com/chaoslawful/lua-nginx-module/issues>),
 
-    2.  Posting to the Nginx Mailing List
-        (<http://mailman.nginx.org/mailman/listinfo/nginx>) and also adding
-        "[ngx_lua]" to the mail subject.
+    2.  or posting to the OpenResty community.
 
 TODO
   Short Term
-    *   implement the "ngx.sleep(time)" Lua API. (For now, use
-        ngx.location.capture with [[HttpEchoModule]]'s echo_sleep config
-        directive instead.)
+    *   review and apply Brian Akin's patch for the new directive
+        "lua_socket_log_errors".
 
-    *   implement the "ngx.worker.get_pid()" Lua API. (For now, use
-        "ngx.var.pid" directly.)
-
-    *   implement LuaSocket UDP API
-        (<http://w3.impa.br/~diego/software/luasocket/udp.html>) in our
-        cosocket API.
+    *   review and apply Brian Akin's patch for the new
+        "shdict:flush_expired()" API.
 
     *   implement the SSL cosocket API.
 
-    *   implement the "ngx.re.split" method.
+    *   review and apply Jader H. Silva's patch for "ngx.re.split()".
+
+    *   review and apply vadim-pavlov's patch for ngx.location.capture's
+        "extra_headers" option
 
     *   use "ngx_hash_t" to optimize the built-in header look-up process for
         ngx.req.set_header, ngx.header.HEADER, and etc.
@@ -4242,7 +5624,7 @@ TODO
     *   add configure options for different strategies of handling the
         cosocket connection exceeding in the pools.
 
-    *   add directives to run Lua codes when nginx stops/reloads.
+    *   add directives to run Lua codes when nginx stops.
 
     *   add APIs to access cookies as key/value pairs.
 
@@ -4250,279 +5632,24 @@ TODO
         options to ngx.location.capture and ngx.location.capture_multi
         methods, to allow micro performance tuning on the user side.
 
+    *   implement new directive "lua_ignore_client_abort".
+
   Longer Term
-    *   add the "lua_require" directive to load module into main thread's
-        globals.
+    *   add lightweight thread API (i.e., the "ngx.thread" API) as
+        demonstrated in this sample code
+        (<http://agentzh.org/misc/nginx/lua-thread2.lua>).
 
-    *   add Lua code automatic time slicing support by yielding and resuming
+    *   add automatic Lua code time slicing support by yielding and resuming
         the Lua VM actively via Lua's debug hooks.
 
-    *   make set_by_lua, header_filter_by_lua, and their variants use the
-        same mechanism as content_by_lua, rewrite_by_lua, access_by_lua, and
-        their variants.
-
-    *   add coroutine API back to the Lua user land.
-
     *   add "stat" mode similar to mod_lua
         (<http://httpd.apache.org/docs/2.3/mod/mod_lua.html>).
 
 Changes
-  v0.4.1
-    1 February, 2012
+    The changes of every release of this module can be obtained from the
+    ngx_openresty bundle's change logs:
 
-    *   bugfix: ngx.exit, ngx.redirect, ngx.exec, and ngx.req.set_uri(uri,
-        true) could return (they should never return as per the
-        documentation). this bug had appeared in ngx_lua v0.3.1rc4 and
-        ngx_openresty 1.0.6.13. thanks @cyberty (<http://weibo.com/cyberty>)
-        for reporting it.
-
-    *   bugfix: "ngx_http_lua_header_filter_init" was called with an
-        argument which actually accepts none. this could cause compilation
-        errors at least with gcc 4.3.4 as reported in github issue #80
-        (<http://github.com/chaoslawful/lua-nginx-module/issues/80>). thanks
-        bigplum (Simon).
-
-    *   bugfix: fixed all the warnings from the clang static analyzer.
-
-    *   feature: allow use of the "DDEBUG" macro from the outside (via the
-        "-D DDEBUG=1" C compiler opton).
-
-  v0.4.0
-    11 January, 2012
-
-    *   bugfix: fixed a bug when the both the main request and the
-        subrequest are POST requests with a body: we should not forward the
-        main request's "Content-Length" headers to the user subrequests.
-        thanks 朱峰.
-
-    *   feature: implemented the API for reading response headers from
-        within Lua: "value = ngx.header.HEADER", see ngx.header.HEADER.
-
-    *   bugfix: fixed a bug when setting a multi-value response header to a
-        single value (via writing to ngx.header.HEADER): the single value
-        will be repeated on each old value.
-
-    *   bugfix: fixed an issue in ngx.redirect, ngx.exit, and ngx.exec:
-        these function calls would be intercepted by Lua "pcall"/"xpcall"
-        because they used Lua exceptions; now they use Lua yield just as
-        ngx.location.capture. thanks @hugozhu for reporting this.
-
-    *   feature: now we also return the "Last-Modified" header (if any) for
-        the subrequest response object. thanks @cyberty and sexybabes.
-
-    *   feature: now ngx.exec supports Lua table as the second args argument
-        value. thanks sexybabes.
-
-    *   feature: implemented the ngx.headers_sent API to check if response
-        headers are sent (by ngx_lua). thanks @hugozhu.
-
-    *   feature: exposes the CRC-32 API of the Nginx core to the Lua land,
-        in the form of the ngx.crc32_short and ngx.crc32_long methods.
-        thanks @Lance.
-
-    *   feature: now for HTTP 1.0 requests, we disable the automatic full
-        buffering mode if the user sets the "Content-Length" response header
-        before sending out the headers. this allows streaming output for
-        HTTP 1.0 requests if the content length can be calculated
-        beforehand. thanks 李子义.
-
-    *   bugfix: now we properly support setting the "Cache-Control" response
-        header via the ngx.header.HEADER interface.
-
-    *   bugfix: no longer set header hash to 1. use the "ngx_hash_key_lc"
-        instead.
-
-    *   bugfix: calling ngx.exec to jump to a named location did not clear
-        the context object of LuaNginxModule properly and might cause evil
-        problems. thanks Nginx User.
-
-    *   bugfix: now we explicitly clear all the modules' contexts before
-        dump to named location with ngx.exec.
-
-    *   feature: implemented ngx.req.set_uri and ngx.req.set_uri_args to
-        emulate [[HttpRewriteModule]]'s rewrite directive. thanks Vladimir
-        Protasov (utros) and Nginx User.
-
-    *   bugfix: now we skip rewrite phase Lua handlers altogether if
-        [[HttpRewriteModule]]'s rewrite directive issue a location re-lookup
-        by changing URIs (but not including "rewrite ... break"). thanks
-        Nginx User.
-
-    *   feature: added constant "ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)".
-        thanks Nginx User.
-
-    *   feature: added new Lua functions ngx.req.read_body,
-        ngx.req.discard_body, ngx.req.get_body_data, and
-        ngx.req.get_body_file. thanks Tzury Bar Yochay for funding the
-        development work.
-
-    *   bugfix: fixed hanging issues when using ngx.exec within
-        rewrite_by_lua and access_by_lua. thanks Nginx User for reporting
-        it.
-
-    *   feature: added new Lua API ngx.req.set_body_file. thanks Tzury Bar
-        Yochay for funding the development work.
-
-    *   feature: added new Lua API ngx.req.set_body_data. thanks Tzury Bar
-        Yochay for funding the development work.
-
-    *   bugfix: lua_need_request_body should not skip requests with methods
-        other than "POST" and "PUT". thanks Nginx User.
-
-    *   bugfix: no longer free request body buffers that are not allocated
-        by ourselves.
-
-    *   bugfix: now we allow setting ngx.var.VARIABLE to nil.
-
-    *   feature: added new directive lua_shared_dict.
-
-    *   feature: added Lua API for the shm-based dictionary, see
-        ngx.shared.DICT.
-
-    *   bugfix: fixed spots of -Werror=unused-but-set-variable warning
-        issued by gcc 4.6.0.
-
-    *   bugfix: ndk.set_var.DIRECTIVE had a memory issue and might pass
-        empty argument values to the directive being called. thanks
-        dannynoonan.
-
-    *   feature: added the "ctx" option to ngx.location.capture: you can now
-        specify a custom Lua table to pass to the subrequest as its ngx.ctx.
-        thanks @hugozhu.
-
-    *   feature: added the ngx.encode_args method to encode a Lua code to a
-        URI query string. thanks 郭颖 (0597虾).
-
-    *   feature: ngx.location.capture and ngx.exec now supports the same Lua
-        args table format as in ngx.encode_args. thanks 郭颖 (0597虾).
-
-    *   bugfix: "Cache-Control" header modification might introduce empty
-        value headers when using with the standard HttpHeadersModule.
-
-    *   feature: added ngx.hmac_sha1. thanks drdrxp.
-
-    *   docs: documented the long-existent ngx.md5 and ngx.md5_bin APIs.
-
-    *   docs: massive documentation improvements. thanks Nginx User.
-
-    *   feature: added new regex options "j" and "d" to ngx.re.match,
-        ngx.re.gmatch, ngx.re.sub, and ngx.re.gsub so as to enable the PCRE
-        JIT mode and DFA mode, respectively. thanks @姜大炮 for providing the
-        patch.
-
-    *   feature: added options "copy_all_vars" and "vars" to
-        ngx.location.capture and ngx.location.capture_multi. thanks Marcus
-        Clyne for the patch.
-
-    *   feature: added new Lua API ngx.now to return the current time
-        (including the milliseconds part as the decimal part). thanks 林青.
-
-    *   feature: added new Lua API ngx.update_time to forcibly updating
-        Nginx's time cache.
-
-    *   feature: added "wait" boolean argument to ngx.flush to support
-        synchronous flushing: "ngx.flush(true)" will not return until all
-        the data has been flushed into the system send buffer or the send
-        timeout has expired.
-
-    *   bugfix: now we check timed out downstream connections in our write
-        event handler.
-
-    *   feature: added constant "ngx.HTTP_GATEWAY_TIMEOUT (504)" per Fry-kun
-        in github issue #73
-        (<https://github.com/chaoslawful/lua-nginx-module/issues/73>).
-
-    *   bugfix: ngx.var.VARIABLE did not evaluate to "nil" when the Nginx
-        variable's "valid" flag is 0.
-
-    *   bugfix: there were various places where we did not check the pointer
-        returned by the memory allocator.
-
-    *   bugfix: ngx.req.set_header and ngx.req.clear_header did not handle
-        the "Accept-Encoding" request headers properly. thanks 天街夜色.
-
-    *   bugfix: ngx.req.set_header might cause invalid memory reads because
-        Nginx request header values must be "NULL" terminated. thanks Maxim
-        Dounin.
-
-    *   bugfix: removing builtin headers via ngx.req.clear_header and its
-        equivalent in huge request headers with 20+ entries could result in
-        data loss. thanks Chris Dumoulin.
-
-    *   bugfix: ngx.req.get_uri_args and ngx.req.get_post_args now only
-        parse up to 100 arguments by default. but one can specify the
-        optional argument to these two methods to specify a custom maximum
-        number of args. thanks Tzury Bar Yochay for reporting this.
-
-    *   bugfix: ngx.req.get_headers now only parse up to 100 request headers
-        by default. but one can specify the optional argument to this method
-        to specify a custom maximum number of headers.
-
-  v0.3.0
-    September 02, 2011
-
-    New features
-
-    *   added the header_filter_by_lua and header_filter_by_lua_file
-        directives. thanks Liseen Wan (万珣新).
-
-    *   implemented the PCRE regex API for Lua: ngx.re.match, ngx.re.gmatch,
-        ngx.re.sub, and ngx.re.gsub.
-
-    *   now we add the "ngx" and "ndk" table into "package.loaded" such that
-        the user can write "local ngx = require 'ngx'" and "local ndk =
-        require 'ndk'". thanks @Lance.
-
-    *   added new directive lua_regex_cache_max_entries to control the upper
-        limit of the worker-process-level compiled-regex cache enabled by
-        the "o" regex option.
-
-    *   implemented the special ngx.ctx Lua table for user programmers to
-        store per-request Lua context data for their applications. thanks
-        欧远宁 for suggesting this feature.
-
-    *   now ngx.print and ngx.say allow (nested) array-like table arguments.
-        the array elements in them will be sent piece by piece. this will
-        avoid string concatenation for templating engines like ltp
-        (<http://www.savarese.com/software/ltp/>).
-
-    *   implemented the ngx.req.get_post_args method for fetching
-        url-encoded POST query arguments from within Lua.
-
-    *   implemented the ngx.req.get_uri_args method to fetch parsed URL
-        query arguments from within Lua. thanks Bertrand Mansion (golgote).
-
-    *   added new function ngx.parse_http_time, thanks James Hurst.
-
-    *   now we allow Lua boolean and "nil" values in arguments to ngx.say,
-        ngx.print, ngx.log and print.
-
-    *   added support for user C macros "LUA_DEFAULT_PATH" and
-        "LUA_DEFAULT_CPATH". for now we can only define them in "ngx_lua"'s
-        "config" file because nginx "configure"'s "--with-cc-opt" option
-        hates values with double-quotes in them. sigh. This feature is used
-        by The ngx_openresty bundle (<http://openresty.org>) to bundle third
-        party Lua libraries.
-
-    Bug fixes
-
-    *   worked-around the "stack overflow" issue while using
-        "luarocks.loader" and disabling lua_code_cache, as described as
-        github issue #27. thanks Patrick Crosby.
-
-    *   fixed the "zero size buf in output" alert while combining
-        lua_need_request_body on + access_by_lua/rewrite_by_lua +
-        proxy_pass/fastcgi_pass. thanks Liseen Wan (万珣新).
-
-    *   fixed issues with HTTP 1.0 HEAD requests.
-
-    *   made setting "ngx.header.HEADER" after sending out response headers
-        throw out a Lua exception to help debugging issues like github issue
-        #49. thanks Bill Donahue (ikhoyo).
-
-    *   fixed an issue regarding defining global variables in C header
-        files: we should have defined the global "ngx_http_lua_exception" in
-        a single compilation unit. thanks @姜大炮.
+    http://openresty.org/#Changes
 
 Test Suite
     The following dependencies are required to run the test suite:
@@ -4605,7 +5732,7 @@ Copyright and License
     Copyright (C) 2009-2012, by Xiaozhe Wang (chaoslawful)
     <chaoslawful@gmail.com>.
 
-    Copyright (C) 2009-2012, by Zhang "agentzh" Yichun (章亦春)
+    Copyright (C) 2009-2012, by Yichun "agentzh" Zhang (章亦春)
     <agentzh@gmail.com>.
 
     All rights reserved.
@@ -4647,6 +5774,9 @@ See Also
     *   lua-resty-upload (<http://github.com/agentzh/lua-resty-upload>)
         library based on ngx_lua cosocket.
 
+    *   lua-resty-dns (<http://github.com/agentzh/lua-resty-dns>) library
+        based on ngx_lua cosocket.
+
     *   lua-resty-string (<http://github.com/agentzh/lua-resty-string>)
         library based on LuaJIT FFI (<http://luajit.org/ext_ffi.html>).
 
@@ -4675,5 +5805,5 @@ See Also
     *   The ngx_openresty bundle (<http://openresty.org>)
 
 Translations
-    *   Chinese
+    *   Chinese (still in progress)
 
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index d4a6f69..3e90b58 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -18,7 +18,7 @@ This module is under active development and is production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.5.0rc28](https://github.com/chaoslawful/lua-nginx-module/tags) released on 16 May 2012.
+This document describes ngx_lua [v0.7.8](https://github.com/chaoslawful/lua-nginx-module/tags) released on 8 December 2012.
 
 Synopsis
 ========
@@ -125,7 +125,7 @@ Synopsis
         location /foo {
             rewrite_by_lua '
                 res = ngx.location.capture("/memc",
-                    { args = { cmd = 'incr', key = ngx.var.uri } }
+                    { args = { cmd = "incr", key = ngx.var.uri } }
                 )
             ';
  
@@ -170,7 +170,7 @@ Synopsis
            client_body_buffer_size 100k;
  
            access_by_lua '
-               -- check the client IP addr is in our black list
+               -- check the client IP address is in our black list
                if ngx.var.remote_addr == "132.5.72.3" then
                    ngx.exit(ngx.HTTP_FORBIDDEN)
                end
@@ -193,13 +193,30 @@ Synopsis
 Description
 ===========
 
-This module embeds Lua, via the standard Lua interpreter or LuaJIT, into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
+This module embeds Lua, via the standard Lua interpreter or [LuaJIT 2.0](http://luajit.org/luajit.html), into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
 
 Unlike [Apache's mod_lua](http://httpd.apache.org/docs/2.3/mod/mod_lua.html) and [Lighttpd's mod_magnet](http://redmine.lighttpd.net/wiki/1/Docs:ModMagnet), Lua code executed using this module can be *100% non-blocking* on network traffic as long as the [Nginx API for Lua](http://wiki.nginx.org/HttpLuaModule#Nginx_API_for_Lua) provided by this module is used to handle
-requests to upstream services such as mysql, postgresql, memcached, redis, or upstream http web services. (See [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture), [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi), [ngx.socket.tcp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.tcp), [HttpDrizzleModule](http://wiki.nginx.org/HttpDrizzleModule), [ngx_postgres](http://github.com/FRiCKLE/ngx_postgres/), [HttpMemcModule](http://wiki.nginx.org/HttpMemcModule), [HttpRedis2Module](http://wiki.nginx.org/HttpRedis2Module) and [HttpProxyModule](http://wiki.nginx.org/HttpProxyModule) modules for details).
+requests to upstream services such as MySQL, PostgreSQL, Memcached, Redis, or upstream HTTP web services.
 
-The Lua interpreter or LuaJIT instance is shared across all the requests in a single nginx worker process but request contexts are segregated using lightweight Lua coroutines. 
-Loaded Lua modules persist in the nginx worker process level resulting in a small memory footprint even when under heavy loads.
+At least the following Lua libraries and Nginx modules can be used with this ngx_lua module:
+
+* [lua-resty-memcached](https://github.com/agentzh/lua-resty-memcached)
+* [lua-resty-mysql](https://github.com/agentzh/lua-resty-mysql)
+* [lua-resty-redis](https://github.com/agentzh/lua-resty-redis)
+* [lua-resty-dns](https://github.com/agentzh/lua-resty-dns)
+* [lua-resty-upload](https://github.com/agentzh/lua-resty-upload)
+* [ngx_memc](http://wiki.nginx.org/HttpMemcModule)
+* [ngx_postgres](https://github.com/FRiCKLE/ngx_postgres)
+* [ngx_redis2](http://wiki.nginx.org/HttpRedis2Module)
+* [ngx_redis](http://wiki.nginx.org/HttpRedisModule)
+* [ngx_proxy](http://wiki.nginx.org/HttpProxyModule)
+* [ngx_fastcgi](http://wiki.nginx.org/HttpFastcgiModule)
+
+Almost all the Nginx modules can be used with this ngx_lua module by means of [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) or [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi) but it is recommended to use those `lua-resty-*` libraries instead of creating subrequests to access the Nginx upstream modules because the former is usually much more flexible and memory-efficient.
+
+The Lua interpreter or LuaJIT instance is shared across all the requests in a single nginx worker process but request contexts are segregated using lightweight Lua coroutines.
+
+Loaded Lua modules persist in the nginx worker process level resulting in a small memory footprint in Lua even when under heavy loads.
 
 Directives
 ==========
@@ -223,14 +240,14 @@ and the Lua `package.loaded` table will be cleared
 at the entry point of every request (such that Lua modules
 will not be cached either). With this in place, developers can adopt an edit-and-refresh approach.
 
-Please note however, that Lua code inlined into nginx.conf
+Please note however, that Lua code written inlined within nginx.conf
 such as those specified by [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua), [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua),
 [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua), and [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) will *always* be
 cached because only the Nginx config file parser can correctly parse the `nginx.conf`
 file and the only ways to to reload the config file
 are to send a `HUP` signal or to restart Nginx.
 
-The ngx_lua module does not currently support the `stat` mode available with the 
+The ngx_lua module does not currently support the `stat` mode available with the
 Apache `mod_lua` module but this is planned for implementation in the future.
 
 Disabling the Lua code cache is strongly
@@ -272,7 +289,7 @@ Sets the Lua module search path used by scripts specified by [set_by_lua](http:/
 [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua) and others. The path string is in standard Lua path form, and `;;`
 can be used to stand for the original search paths.
 
-Since the `v0.5.0rc29` release, the special notation `$prefix` or `${prefix}` can be used in the search path string to indicate the path of the `server prefix` usually determined by the `-p PATH` command-line option while starting the Nginx server.
+As from the `v0.5.0rc29` release, the special notation `$prefix` or `${prefix}` can be used in the search path string to indicate the path of the `server prefix` usually determined by the `-p PATH` command-line option while starting the Nginx server.
 
 lua_package_cpath
 -----------------
@@ -287,23 +304,107 @@ Sets the Lua C-module search path used by scripts specified by [set_by_lua](http
 [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua) and others. The cpath string is in standard Lua cpath form, and `;;`
 can be used to stand for the original cpath.
 
-Since the `v0.5.0rc29` release, the special notation `$prefix` or `${prefix}` can be used in the search path string to indicate the path of the `server prefix` usually determined by the `-p PATH` command-line option while starting the Nginx server.
+As from the `v0.5.0rc29` release, the special notation `$prefix` or `${prefix}` can be used in the search path string to indicate the path of the `server prefix` usually determined by the `-p PATH` command-line option while starting the Nginx server.
+
+init_by_lua
+-----------
+
+**syntax:** *init_by_lua &lt;lua-script-str&gt;*
+
+**context:** *http*
+
+**phase:** *loading-config*
+
+Runs the Lua code specified by the argument `<lua-script-str>` on the global Lua VM level when the Nginx master process (if any) is loading the Nginx config file.
+
+When Nginx receives the `HUP` signal and starts reloading the config file, the Lua VM will also be re-created and `init_by_lua` will run again on the new Lua VM.
+
+Usually you can register (true) Lua global variables or pre-load Lua modules at server start-up by means of this hook. Here is an example for pre-loading Lua modules:
+
+
+    init_by_lua 'require "cjson"';
+
+    server {
+        location = /api {
+            content_by_lua '
+                ngx.say(cjson.encode({dog = 5, cat = 6}))
+            ';
+        }
+    }
+
+
+You can also initialize the [lua_shared_dict](http://wiki.nginx.org/HttpLuaModule#lua_shared_dict) shm storage at this phase. Here is an example for this:
+
+
+    lua_shared_dict dogs 1m;
+
+    init_by_lua '
+        local dogs = ngx.shared.dogs;
+        dogs:set("Tom", 56)
+    ';
+
+    server {
+        location = /api {
+            content_by_lua '
+                local dogs = ngx.shared.dogs;
+                ngx.say(dogs:get("Tom"))
+            ';
+        }
+    }
+
+
+But note that, the [lua_shared_dict](http://wiki.nginx.org/HttpLuaModule#lua_shared_dict)'s shm storage will not be cleared through a config reload (via the `HUP` signal, for example). So if you do *not* want to re-initialize the shm storage in your `init_by_lua` code in this case, then you just need to set a custom flag in the shm storage and always check the flag in your `init_by_lua` code.
+
+Because the Lua code in this context runs before Nginx forks its worker processes (if any), data or code loaded here will enjoy the [Copy-on-write (COW)](http://en.wikipedia.org/wiki/Copy-on-write) feature provided by many operating systems among all the worker processes, thus saving a lot of memory.
+
+Only a small set of the [Nginx API for Lua](http://wiki.nginx.org/HttpLuaModule#Nginx_API_for_Lua) is supported in this context:
+
+* Logging APIs: [ngx.log](http://wiki.nginx.org/HttpLuaModule#ngx.log) and [print](http://wiki.nginx.org/HttpLuaModule#print),
+* Shared Dictionary API: [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
+
+More Nginx APIs for Lua may be supported in this context upon future user requests.
+
+Basically you can safely use Lua libraries that do blocking I/O in this very context because blocking the master process during server start-up is completely okay. Even the Nginx core does blocking I/O (at least on resolving upstream's host names) at the configure-loading phase.
+
+You should be very careful about potential security vulnerabilities in your Lua code registered in this context because the Nginx master process is often run under the `root` account.
+
+This directive was first introduced in the `v0.5.5` release.
+
+init_by_lua_file
+----------------
+
+**syntax:** *init_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *http*
+
+**phase:** *loading-config*
+
+Equivalent to [init_by_lua](http://wiki.nginx.org/HttpLuaModule#init_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code or [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
+
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+
+This directive was first introduced in the `v0.5.5` release.
 
 set_by_lua
 ----------
 
 **syntax:** *set_by_lua $res &lt;lua-script-str&gt; [$arg1 $arg2 ...]*
 
-**context:** *main, server, location, server if, location if*
+**context:** *server, server if, location, location if*
 
-**phase:** *rewrite*
+**phase:** *server-rewrite, rewrite*
 
 Executes code specified in `<lua-script-str>` with optional input arguments `$arg1 $arg2 ...`, and returns string output to `$res`. 
 The code in `<lua-script-str>` can make [API calls](http://wiki.nginx.org/HttpLuaModule#Nginx_API_for_Lua) and can retrieve input arguments from the `ngx.arg` table (index starts from `1` and increases sequentially).
 
 This directive is designed to execute short, fast running code blocks as the Nginx event loop is blocked during code execution. Time consuming code sequences should therefore be avoided.
 
-Note that I/O operations such as [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say), [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), [echo](http://wiki.nginx.org/HttpEchoModule#echo) and similar are not permitted within the context of this directive.
+Note that the following API functions are currently disabled within this context:
+
+* Output API functions (e.g., [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) and [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers))
+* Control API functions (e.g., [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit)) 
+* Subrequest API functions (e.g., [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi))
+* Cosocket API functions (e.g., [ngx.socket.tcp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.tcp) and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket)).
 
 In addition, note that this directive can only write out a value to a single Nginx variable at
 a time. However, a workaround is possible using the [ngx.var.VARIABLE](http://wiki.nginx.org/HttpLuaModule#ngx.var.VARIABLE) interface.
@@ -332,7 +433,7 @@ This directive can be freely mixed with all directives of the [HttpRewriteModule
     set $baz "bar: $bar";  # $baz == "bar: 33"
 
 
-Since the `0.5.0rc29` release, Nginx variable interpolation is disabled in the `<lua-script-str>` argument of this directive, and you can use the dollar sign character (`$`) directly.
+As from the `v0.5.0rc29` release, Nginx variable interpolation is disabled in the `<lua-script-str>` argument of this directive and therefore, the dollar sign character (`$`) can be used directly.
 
 This directive requires the [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit) module.
 
@@ -340,15 +441,15 @@ set_by_lua_file
 ---------------
 **syntax:** *set_by_lua_file $res &lt;path-to-lua-script-file&gt; [$arg1 $arg2 ...]*
 
-**context:** *main, server, location, server if, location if*
+**context:** *server, server if, location, location if*
 
-**phase:** *rewrite*
+**phase:** *server-rewrite, rewrite*
 
-Equivalent to [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code to be executed.
+Equivalent to [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or, as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed. 
 
 Nginx variable interpolation is supported in the `<path-to-lua-script-file>` argument string of this directive. But special care must be taken for injection attacks.
 
-When a relative path like `foo/bar.lua` is given, they will be turned into the absoluate path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached 
 and the Nginx config must be reloaded each time the Lua source file is modified.
@@ -380,11 +481,11 @@ content_by_lua_file
 
 **phase:** *content*
 
-Equivalent to [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code to be executed.
+Equivalent to [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or, as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
 
 Nginx variables can be used in the `<path-to-lua-script-file>` string to provide flexibility. This however carries some risks and is not ordinarily recommended.
 
-When a relative path like `foo/bar.lua` is given, they will be turned into the absoluate path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached 
 and the Nginx config must be reloaded each time the Lua source file is modified.
@@ -467,7 +568,7 @@ Note that the [ngx_eval](http://www.grid.net.ru/nginx/eval.en.html) module can b
     }
 
 
-can be implemented in `ngx_lua` as:
+can be implemented in ngx_lua as:
 
 
     location = /check-spam {
@@ -479,7 +580,7 @@ can be implemented in `ngx_lua` as:
         rewrite_by_lua '
             local res = ngx.location.capture("/check-spam")
             if res.body == "spam" then
-                ngx.redirect("/terms-of-use.html")
+                return ngx.redirect("/terms-of-use.html")
             end
         ';
  
@@ -503,7 +604,9 @@ If the [HttpRewriteModule](http://wiki.nginx.org/HttpRewriteModule)'s [rewrite](
     }
 
 
-Here the Lua code `ngx.exit(503)` will never run. This will be the case if `rewrite ^ /bar last` is used as this will similarly initiate an internal redirection. If the `break` modifier is used instead, there will be no internal redirection and the rewrite_by_lua code will be executed.
+Here the Lua code `ngx.exit(503)` will never run. This will be the case if `rewrite ^ /bar last` is used as this will similarly initiate an internal redirection. If the `break` modifier is used instead, there will be no internal redirection and the `rewrite_by_lua` code will be executed.
+
+The `rewrite_by_lua` code will always run at the end of the `rewrite` request-processing phase unless [rewrite_by_lua_no_postpone](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua_no_postpone) is turned on.
 
 rewrite_by_lua_file
 -------------------
@@ -514,14 +617,16 @@ rewrite_by_lua_file
 
 **phase:** *rewrite tail*
 
-Equivalent to [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code to be executed.
+Equivalent to [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or, as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
 
 Nginx variables can be used in the `<path-to-lua-script-file>` string to provide flexibility. This however carries some risks and is not ordinarily recommended.
 
-When a relative path like `foo/bar.lua` is given, they will be turned into the absoluate path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached and the Nginx config must be reloaded each time the Lua source file is modified. The Lua code cache can be temporarily disabled during development by switching [lua_code_cache](http://wiki.nginx.org/HttpLuaModule#lua_code_cache) `off` in `nginx.conf` to avoid reloading Nginx.
 
+The `rewrite_by_lua_file` code will always run at the end of the `rewrite` request-processing phase unless [rewrite_by_lua_no_postpone](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua_no_postpone) is turned on.
+
 access_by_lua
 -------------
 
@@ -564,7 +669,7 @@ Note that the [ngx_auth_request](http://mdounin.ru/hg/ngx_http_auth_request_modu
     }
 
 
-can be implemented in `ngx_lua` as:
+can be implemented in ngx_lua as:
 
 
     location / {
@@ -599,11 +704,11 @@ access_by_lua_file
 
 **phase:** *access tail*
 
-Equivalent to [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code to be executed.
+Equivalent to [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or, as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
 
 Nginx variables can be used in the `<path-to-lua-script-file>` string to provide flexibility. This however carries some risks and is not ordinarily recommended.
 
-When a relative path like `foo/bar.lua` is given, they will be turned into the absoluate path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached 
 and the Nginx config must be reloaded each time the Lua source file is modified.
@@ -618,11 +723,14 @@ header_filter_by_lua
 
 **phase:** *output-header-filter*
 
-Uses Lua code specified in `<lua-script-str>` to define an output header filter. Note that the following API functions are currently disabled within this context:
+Uses Lua code specified in `<lua-script-str>` to define an output header filter.
+
+Note that the following API functions are currently disabled within this context:
 
 * Output API functions (e.g., [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) and [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers))
-* Control API functions (e.g., [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit)) 
+* Control API functions (e.g., [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) and [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec))
 * Subrequest API functions (e.g., [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi))
+* Cosocket API functions (e.g., [ngx.socket.tcp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.tcp) and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket)).
 
 Here is an example of overriding a response header (or adding one if absent) in our Lua header filter:
 
@@ -644,12 +752,188 @@ header_filter_by_lua_file
 
 **phase:** *output-header-filter*
 
-Equivalent to [header_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code to be executed.
+Equivalent to [header_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
 
-When a relative path like `foo/bar.lua` is given, they will be turned into the absoluate path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
 
 This directive was first introduced in the `v0.2.1rc20` release.
 
+body_filter_by_lua
+------------------
+
+**syntax:** *body_filter_by_lua &lt;lua-script-str&gt;*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-body-filter*
+
+Uses Lua code specified in `<lua-script-str>` to define an output body filter.
+
+The input data chunk is passed via [ngx.arg](http://wiki.nginx.org/HttpLuaModule#ngx.arg)[1] (as a Lua string value) and the "eof" flag indicating the end of the response body data stream is passed via [ngx.arg](http://wiki.nginx.org/HttpLuaModule#ngx.arg)[2] (as a Lua boolean value).
+
+Behind the scene, the "eof" flag is just the `last_buf` flag of the nginx chain link buffers. And in the context of an Nginx subrequest, there is no "eof" flag at all, due to the underlying limitation in the Nginx core.
+
+The output data stream can be aborted immediately by running the following Lua statement:
+
+
+    return ngx.ERROR
+
+
+This will truncate the response body and usually result in incomplete and also invalid responses.
+
+The Lua code can pass its own modified version of the input data chunk to the downstream Nginx output body filters by overriding [ngx.arg](http://wiki.nginx.org/HttpLuaModule#ngx.arg)[1] with a Lua string or a Lua table of strings. For example, to transform all the lowercase letters in the response body, we can just write:
+
+
+    location / {
+        proxy_pass http://mybackend;
+        body_filter_by_lua 'ngx.arg[1] = string.upper(ngx.arg[1])';
+    }
+
+
+When setting `nil` or an empty Lua string value to `ngx.arg[1]`, no data chunk will be passed to the downstream Nginx output filters at all.
+
+Likewise, new "eof" flag can also be specified by setting a boolean value to [ngx.arg](http://wiki.nginx.org/HttpLuaModule#ngx.arg)[2]. For example,
+
+
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk = ngx.arg[1]
+            if string.match(chunk, "hello") then
+                ngx.arg[2] = true  -- new eof
+                return
+            end
+
+            -- just throw away any remaining chunk data
+            ngx.arg[1] = nil
+        ';
+    }
+
+
+Then `GET /t` will just return the output
+
+
+    hello world
+
+
+That is, when the body filter sees a chunk containing the word "hello", then it will set the "eof" flag to true immediately, resulting in truncated but still valid responses.
+
+When the Lua code may change the length of the response body, then it is required to always clear out the `Content-Length` response header (if any) in a header filter to enforce streaming output, as in
+
+
+    location /foo {
+        # fastcgi_pass/proxy_pass/...
+
+        header_filter_by_lua 'ngx.header.content_length = nil';
+        body_filter_by_lua 'ngx.arg[1] = {string.len(arg[1]), "\n"}'
+    }
+
+
+Note that the following API functions are currently disabled within this context:
+
+* Output API functions (e.g., [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) and [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers))
+* Control API functions (e.g., [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) and [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec))
+* Subrequest API functions (e.g., [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi))
+* Cosocket API functions (e.g., [ngx.socket.tcp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.tcp) and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket)).
+
+Nginx output filters may be called multiple times for a single request because response body may be delivered in chunks. Thus, the Lua code specified by in this directive may also run multiple times in the lifetime of a single HTTP request.
+
+This directive was first introduced in the `v0.5.0rc32` release.
+
+body_filter_by_lua_file
+-----------------------
+
+**syntax:** *body_filter_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-body-filter*
+
+Equivalent to [body_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#body_filter_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or, as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
+
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+
+This directive was first introduced in the `v0.5.0rc32` release.
+
+log_by_lua
+----------
+
+**syntax:** *log_by_lua &lt;lua-script-str&gt;*
+
+**context:** *http, server, location, location if*
+
+**phase:** *log*
+
+Run the Lua source code inlined as the `<lua-script-str>` at the `log` request processing phase. This does not replace the current access logs, but runs after.
+
+Note that the following API functions are currently disabled within this context:
+
+* Output API functions (e.g., [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) and [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers))
+* Control API functions (e.g., [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit)) 
+* Subrequest API functions (e.g., [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi))
+* Cosocket API functions (e.g., [ngx.socket.tcp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.tcp) and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket)).
+
+Here is an example of gathering average data for [$upstream_response_time](http://wiki.nginx.org/HttpUpstreamModule#.24upstream_response_time):
+
+
+    lua_shared_dict log_dict 5M;
+
+    server {
+        location / {
+            proxy_pass http://mybackend;
+
+            log_by_lua '
+                local log_dict = ngx.shared.log_dict
+                local upstream_time = tonumber(ngx.var.upstream_response_time)
+
+                local sum = log_dict:get("upstream_time-sum") or 0
+                sum = sum + upstream_time
+                log_dict:set("upstream_time-sum", sum)
+
+                local newval, err = log_dict:incr("upstream_time-nb", 1)
+                if not newval and err == "not found" then
+                    log_dict:add("upstream_time-nb", 0)
+                    log_dict:incr("upstream_time-nb", 1)
+                end
+            ';
+        }
+
+        location = /status {
+            content_by_lua '
+                local log_dict = ngx.shared.log_dict
+                local sum = log_dict:get("upstream_time-sum")
+                local nb = log_dict:get("upstream_time-nb")
+    
+                if nb and sum then
+                    ngx.say("average upstream response time: ", sum / nb,
+                            " (", nb, " reqs)")
+                else
+                    ngx.say("no data yet")
+                end
+            ';
+        }
+    }
+
+
+This directive was first introduced in the `v0.5.0rc31` release.
+
+log_by_lua_file
+---------------
+
+**syntax:** *log_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *http, server, location, location if*
+
+**phase:** *log*
+
+Equivalent to [log_by_lua](http://wiki.nginx.org/HttpLuaModule#log_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or, as from the `v0.5.0rc32` release, the [Lua/LuaJIT bytecode](http://wiki.nginx.org/HttpLuaModule#Lua/LuaJIT_bytecode_support) to be executed.
+
+When a relative path like `foo/bar.lua` is given, they will be turned into the absolute path relative to the `server prefix` path determined by the `-p PATH` command-line option while starting the Nginx server.
+
+This directive was first introduced in the `v0.5.0rc31` release.
+
 lua_need_request_body
 ---------------------
 
@@ -664,7 +948,7 @@ lua_need_request_body
 Determines whether to force the request body data to be read before running rewrite/access/access_by_lua* or not. The Nginx core does not read the client request body by default and if request body data is required, then this directive should be turned `on` or the [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) function should be called within the Lua code.
 
 To read the request body data within the [$request_body](http://wiki.nginx.org/HttpCoreModule#.24request_body) variable, 
-[client_body_buffer_size](http://wiki.nginx.org/HttpCoreModule#client_body_buffer_size) must have the same value as [client_max_body_size](http://wiki.nginx.org/HttpCoreModule#client_max_body_size). Because when the content length exceeds [client_body_buffer_size](http://wiki.nginx.org/HttpCoreModule#client_body_buffer_size) but less than [client_max_body_size](http://wiki.nginx.org/HttpCoreModule#client_max_body_size), Nginx will automatically buffer the data into a temporary file on the disk, which will lead to empty value in the [$request_body](http://wiki.nginx.org/HttpCoreModule#.24request_body) variable.
+[client_body_buffer_size](http://wiki.nginx.org/HttpCoreModule#client_body_buffer_size) must have the same value as [client_max_body_size](http://wiki.nginx.org/HttpCoreModule#client_max_body_size). Because when the content length exceeds [client_body_buffer_size](http://wiki.nginx.org/HttpCoreModule#client_body_buffer_size) but less than [client_max_body_size](http://wiki.nginx.org/HttpCoreModule#client_max_body_size), Nginx will buffer the data into a temporary file on the disk, which will lead to empty value in the [$request_body](http://wiki.nginx.org/HttpCoreModule#.24request_body) variable.
 
 If the current location includes [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) or [rewrite_by_lua_file](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua_file) directives,
 then the request body will be read just before the [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) or [rewrite_by_lua_file](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua_file) code is run (and also at the
@@ -687,7 +971,7 @@ lua_shared_dict
 
 **phase:** *depends on usage*
 
-Declares a shared memory zone, `<name>`, to serve as storage for the shm-based Lua dictionary `ngx.shared.<name>`.
+Declares a shared memory zone, `<name>`, to serve as storage for the shm based Lua dictionary `ngx.shared.<name>`.
 
 The `<size>` argument accepts size units such as `k` and `m`:
 
@@ -788,7 +1072,7 @@ Specifies the size limit (in terms of connection count) for every cosocket conne
 
 Default to 30 connections for every pool.
 
-When the connection pool is exceeding the size limit, the least recently used (idle) connection already in the pool will be closed automatically to make room for the current connection. 
+When the connection pool exceeds the available size limit, the least recently used (idle) connection already in the pool will be closed to make room for the current connection.
 
 Note that the cosocket connection pool is per nginx worker process rather than per nginx server instance, so so size limit specified here also applies to every single nginx worker process.
 
@@ -803,12 +1087,25 @@ lua_socket_keepalive_timeout
 
 **context:** *http, server, location*
 
-This directive controls the default maximal idle time of the connections in the cosocket built-in connection pool. When this timeout reaches, idle connections will be closed automatically and removed from the pool. This setting can be overridden by cosocket objects' [setkeepalive](http://wiki.nginx.org/HttpLuaModule#tcpsock:setkeepalive) method.
+This directive controls the default maximal idle time of the connections in the cosocket built-in connection pool. When this timeout reaches, idle connections will be closed and removed from the pool. This setting can be overridden by cosocket objects' [setkeepalive](http://wiki.nginx.org/HttpLuaModule#tcpsock:setkeepalive) method.
 
-The `<time>` argument can be an integer, with an optional time unit, like `s` (second), `ms` (millisecond), `m` (minute). The default time unit is `s`, ie, "second". The default setting is `60s`.
+The `<time>` argument can be an integer, with an optional time unit, like `s` (second), `ms` (millisecond), `m` (minute). The default time unit is `s`, i.e., "second". The default setting is `60s`.
 
 This directive was first introduced in the `v0.5.0rc1` release.
 
+lua_socket_log_errors
+---------------------
+
+**syntax:** *lua_socket_log_errors on|off*
+
+**default:** *lua_socket_log_errors on*
+
+**context:** *http, server, location*
+
+This directive can be used to toggle error logging when a failure occurs for the TCP or UDP cosockets. If you are already doing proper error handling and logging in your Lua code, then it is recommended to turn this directive off to prevent data flushing in your nginx error log files (which is usually rather expensive).
+
+This directive was first introduced in the `v0.5.13` release.
+
 lua_http10_buffering
 --------------------
 
@@ -818,11 +1115,11 @@ lua_http10_buffering
 
 **context:** *http, server, location, location-if*
 
-Enables or disables the automatic response caching for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which replies on a proper `Content-Length` response header.
+Enables or disables response caching for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which replies on a proper `Content-Length` response header.
 
-If the Lua code explicitly sets a `Content-Length` response header before sending the headers (either explicity via [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers) or implicitly via the first [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) or [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) call).
+If the Lua code explicitly sets a `Content-Length` response header before sending the headers (either explicitly via [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers) or implicitly via the first [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) or [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) call).
 
-If you want to output huge response data in a streaming fashion (via the [ngx.flush](http://wiki.nginx.org/HttpLuaModule#ngx.flush) call, for example), then you MUST turn off this directive to prevent memory footprint boost.
+To output very large response data in a streaming fashion (via the [ngx.flush](http://wiki.nginx.org/HttpLuaModule#ngx.flush) call, for example), this directive MUST be turned off to minimize memory usage.
 
 This directive is turned `on` by default.
 
@@ -841,30 +1138,72 @@ Controls whether or not to disable postponing [rewrite_by_lua](http://wiki.nginx
 
 This directive was first introduced in the `v0.5.0rc29` release.
 
+lua_transform_underscores_in_response_headers
+---------------------------------------------
+
+**syntax:** *lua_transform_underscores_in_response_headers on|off*
+
+**default:** *lua_transform_underscores_in_response_headers on*
+
+**context:** *http, server, location, location-if*
+
+Controls whether to transform underscores (`_`) in the response header names specified in the [ngx.header.HEADER](http://wiki.nginx.org/HttpLuaModule#ngx.header.HEADER) API to hypens (`-`).
+
+This directive was first introduced in the `v0.5.0rc32` release.
+
+lua_check_client_abort
+----------------------
+
+**syntax:** *lua_check_client_abort on|off*
+
+**default:** *lua_check_client_abort off*
+
+**context:** *http, server, location, location-if*
+
+This directive controls whether to check for premature client connection abortion.
+
+When this directive is turned on, the ngx_lua module will monitor the premature connection close event on the downstream connections. And when there is such an event, it will call the user Lua function callback (registered by [ngx.on_abort](http://wiki.nginx.org/HttpLuaModule#ngx.on_abort)) or just stop and clean up all the Lua "light threads" running in the current request's request handler when there is no user callback function registered.
+
+According to the current implementation, however, if the client closes the connection before the Lua code finishes reading the request body data via [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket), then ngx_lua will neither stop all the running "light threads" nor call the user callback (if [ngx.on_abort](http://wiki.nginx.org/HttpLuaModule#ngx.on_abort) has been called). Instead, the reading operation on [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket) will just return the error message "client aborted" as the second return value (the first return value is surely `nil`).
+
+When TCP keepalive is disabled, it is relying on the client side to close the socket gracefully (by sending a `FIN` packet or something like that). For (soft) real-time web applications, it is highly recommended to configure the [TCP keepalive](http://tldp.org/HOWTO/TCP-Keepalive-HOWTO/overview.html) support in your system's TCP stack implementation in order to detect "half-open" TCP connections in time.
+
+For example, on Linux, you can configure the standard [listen](http://wiki.nginx.org/HttpCoreModule#listen) directive in your `nginx.conf` file like this:
+
+
+    listen 80 so_keepalive=2s:2s:8;
+
+
+On FreeBSD, you can only tune the system-wide configuration for TCP keepalive, for example:
+
+    # sysctl net.inet.tcp.keepintvl=2000
+    # sysctl net.inet.tcp.keepidle=2000
+
+This directive was first introduced in the `v0.7.4` release.
+
+See also [ngx.on_abort](http://wiki.nginx.org/HttpLuaModule#ngx.on_abort).
+
 Nginx API for Lua
 =================
 Introduction
 ------------
 The various `*_by_lua` and `*_by_lua_file` configuration directives serve as gateways to the Lua API within the `nginx.conf` file. The Nginx Lua API described below can only be called within the user Lua code run in the context of these configuration directives.
 
-The API is exposed to Lua in the form of two standard packages `ngx` and `ndk`. These packages are in the default global scope within `ngx_lua` and are always available within `ngx_lua` directives.
+The API is exposed to Lua in the form of two standard packages `ngx` and `ndk`. These packages are in the default global scope within ngx_lua and are always available within ngx_lua directives.
 
-The packages can be introduced into external Lua modules by using the [package.seeall](http://www.lua.org/manual/5.1/manual.html#pdf-package.seeall) option:
+The packages can be introduced into external Lua modules like this:
 
 
-    module("my_module", package.seeall)
+    local say = ngx.say
 
-    function say(a) ngx.say(a) end
+    module(...)
+
+    function foo(a) 
+        say(a) 
+    end
 
 
-Alternatively, they can be imported to external Lua modules by using file scoped local Lua variables:
-
-
-    local ngx = ngx
-    module("my_module")
-
-    function say(a) ngx.say(a) end
-
+Use of the [package.seeall](http://www.lua.org/manual/5.1/manual.html#pdf-package.seeall) flag is strongly discouraged due to its various bad side-effects.
 
 It is also possible to directly require the packages in external Lua modules:
 
@@ -875,15 +1214,15 @@ It is also possible to directly require the packages in external Lua modules:
 
 The ability to require these packages was introduced in the `v0.2.1rc19` release.
 
-Network I/O operations in user code should only be done through the Nginx Lua API calls as the Nginx event loop may be blocked and performance drop off dramatically otherwise. Disk operations with relatively small amount of data can be done using the standard Lua `io` library but huge file reading and writing should be avoided wherever possible as they may block the Nginx process significantly. Delegating all network and disk I/O operations to Nginx's subrequests (via the [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.catpure) method and similar) is strongly recommended for maximum performance.
+Network I/O operations in user code should only be done through the Nginx Lua API calls as the Nginx event loop may be blocked and performance drop off dramatically otherwise. Disk operations with relatively small amount of data can be done using the standard Lua `io` library but huge file reading and writing should be avoided wherever possible as they may block the Nginx process significantly. Delegating all network and disk I/O operations to Nginx's subrequests (via the [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) method and similar) is strongly recommended for maximum performance.
 
 ngx.arg
 -------
 **syntax:** *val = ngx.arg[index]*
 
-**context:** *set_by_lua**
+**context:** *set_by_lua*, body_filter_by_lua**
 
-Index the input arguments to the [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua) and [set_by_lua_file](http://wiki.nginx.org/HttpLuaModule#set_by_lua_file) directives:
+When this is used in the context of the [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua) or [set_by_lua_file](http://wiki.nginx.org/HttpLuaModule#set_by_lua_file) directives, this table is read-only and holds the input arguments to the config directives:
 
 
     value = ngx.arg[n]
@@ -906,11 +1245,15 @@ Here is an example
 
 that writes out `88`, the sum of `32` and `56`.
 
+When this table is used in the context of [body_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#body_filter_by_lua) or [body_filter_by_lua_file](http://wiki.nginx.org/HttpLuaModule#body_filter_by_lua_file), the first element holds the input data chunk to the output filter code and the second element holds the boolean flag for the "eof" flag indicating the end of the whole output data stream.
+
+The data chunk and "eof" flag passed to the downstream Nginx output filters can also be overridden by assigning values directly to the corresponding table elements. When setting `nil` or an empty Lua string value to `ngx.arg[1]`, no data chunk will be passed to the downstream Nginx output filters at all.
+
 ngx.var.VARIABLE
 ----------------
 **syntax:** *ngx.var.VAR_NAME*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Read and write Nginx variable values.
 
@@ -946,9 +1289,18 @@ Setting `ngx.var.Foo` to a `nil` value will unset the `$Foo` Nginx variable.
     ngx.var.args = nil
 
 
+**WARNING** When reading from an Nginx variable, Nginx will allocate memory in the per-request memory pool which is freed only at request termination. So when you need to read from an Nginx variable repeatedly in your Lua code, cache the Nginx variable value to your own Lua variable, for example,
+
+
+    local val = ngx.var.some_var
+    --- use the val repeatedly later
+
+
+to prevent (temporary) memory leaking within the current request's lifetime.
+
 Core constants
 --------------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, *log_by_lua**
 
 
       ngx.OK (0)
@@ -964,13 +1316,13 @@ Note that only three of these constants are utilized by the [Nginx API for Lua](
       ngx.null
 
 
-The `ngx.null` constant is a `NULL` light userdata which is usually used to represent nil values in Lua tables and etc. It is identical with the [lua-cjson](http://www.kyne.com.au/~mark/software/lua-cjson.php) library's `cjson.null` constant. This constant was first introduced in the `v0.5.0rc5` release.
+The `ngx.null` constant is a `NULL` light userdata usually used to represent nil values in Lua tables etc and is similar to the [lua-cjson](http://www.kyne.com.au/~mark/software/lua-cjson.php) library's `cjson.null` constant. This constant was first introduced in the `v0.5.0rc5` release.
 
 The `ngx.DECLINED` constant was first introduced in the `v0.5.0rc19` release.
 
 HTTP method constants
 ---------------------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 
       ngx.HTTP_GET
@@ -985,7 +1337,7 @@ These constants are usually used in [ngx.location.capture](http://wiki.nginx.org
 
 HTTP status constants
 ---------------------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 
       value = ngx.HTTP_OK (200)
@@ -1009,7 +1361,7 @@ HTTP status constants
 
 Nginx log level constants
 -------------------------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 
       ngx.STDERR
@@ -1029,7 +1381,7 @@ print
 -----
 **syntax:** *print(...)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 Writes argument values into the nginx `error.log` file with the `ngx.NOTICE` log level.
 
@@ -1041,11 +1393,11 @@ It is equivalent to
 
 Lua `nil` arguments are accepted and result in literal `"nil"` strings while Lua booleans result in literal `"true"` or `"false"` strings. And the `ngx.null` constant will yield the `"null"` string output.
 
-There is a hard-coded length limitation on the error messages in the Nginx core. It is `2048` bytes at most, including the trailing newlines and the leading timestamps. You can manually modify this limit by modifying the `NGX_MAX_ERROR_STR` macro definition in the `src/core/ngx_log.h` file in the Nginx source tree. If the message size exceeds this limit, the Nginx core will truncate the message text automatically.
+There is a hard coded `2048` byte limitation on error message lengths in the Nginx core. This limit includes trailing newlines and leading time stamps. If the message size exceeds this limit, Nginx will truncate the message text accordingly. This limit can be manually modified by editing the `NGX_MAX_ERROR_STR` macro definition in the `src/core/ngx_log.h` file in the Nginx source tree.
 
 ngx.ctx
 -------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 This table can be used to store per-request Lua context data and has a life time identical to the current request (as with the Nginx variables). 
 
@@ -1150,7 +1502,7 @@ ngx.location.capture
 Issue a synchronous but still non-blocking *Nginx Subrequest* using `uri`.
 
 Nginx's subrequests provide a powerful way to make non-blocking internal requests to other locations configured with disk file directory or *any* other nginx C modules like `ngx_proxy`, `ngx_fastcgi`, `ngx_memc`,
-`ngx_postgres`, `ngx_drizzle`, and even `ngx_lua` itself and etc etc etc.
+`ngx_postgres`, `ngx_drizzle`, and even ngx_lua itself and etc etc etc.
 
 Also note that subrequests just mimic the HTTP interface but there is *no* extra HTTP/TCP traffic *nor* IPC involved. Everything works internally, efficiently, on the C level.
 
@@ -1176,7 +1528,7 @@ lines:
     Set-Cookie: baz=blah
 
 
-Then `res.header["Set-Cookie"]` will be evaluted to the table value
+Then `res.header["Set-Cookie"]` will be evaluated to the table value
 `{"a=3", "foo=bar", "baz=blah"}`.
 
 URI query strings can be concatenated to URI itself, for instance,
@@ -1233,8 +1585,8 @@ is equivalent to
     ngx.location.capture('/foo?a=1&b=3&c=%3a')
 
 
-that is, this method will automatically escape argument keys and values according to URI rules and
-concatenating them together into a complete query string. The format for the Lua table passed as the `args` argument is identical to the format used in the [ngx.encode_args](http://wiki.nginx.org/HttpLuaModule#ngx.encode_args) method.
+that is, this method will escape argument keys and values according to URI rules and
+concatenate them together into a complete query string. The format for the Lua table passed as the `args` argument is identical to the format used in the [ngx.encode_args](http://wiki.nginx.org/HttpLuaModule#ngx.encode_args) method.
 
 The `args` option can also take plain query strings:
 
@@ -1255,20 +1607,20 @@ This option is set to `false` by default
 
 
     location /other {
-        set $dog "$dog world";                  
-        echo "$uri dog: $dog";                    
-    }                                     
-    
+        set $dog "$dog world";
+        echo "$uri dog: $dog";
+    }
+
     location /lua {
         set $dog 'hello';
         content_by_lua '
             res = ngx.location.capture("/other",
                 { share_all_vars = true });
-                
+
             ngx.print(res.body)
             ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        ';  
-    }           
+        ';
+    }
 
 
 Accessing location `/lua` gives
@@ -1345,25 +1697,25 @@ The `ctx` option can be used to specify a custom Lua table to serve as the [ngx.
 
 
     location /sub {
-        content_by_lua '                          
-            ngx.ctx.foo = "bar";                  
+        content_by_lua '
+            ngx.ctx.foo = "bar";
         ';
-    }   
+    }
     location /lua {
         content_by_lua '
-            local ctx = {}                        
+            local ctx = {}
             res = ngx.location.capture("/sub", { ctx = ctx })
-            
+
             ngx.say(ctx.foo);
-            ngx.say(ngx.ctx.foo);                 
-        ';                                        
+            ngx.say(ngx.ctx.foo);
+        ';
     }
 
 
 Then request `GET /lua` gives
 
 
-    bar                                               
+    bar
     nil
 
 
@@ -1396,13 +1748,15 @@ subrequests, an "Accept-Encoding: gzip" header in the main request may result
 in gzipped responses that cannot be handled properly in Lua code. Original request headers should be ignored by setting 
 [proxy_pass_request_headers](http://wiki.nginx.org/HttpProxyModule#proxy_pass_request_headers) to `off` in subrequest locations.
 
-There is a hard-coded upper limit on the number of concurrent subrequests every main request. In older versions of Nginx, the limit is `50`, which is then increased to `200` in recent Nginx `1.1.x` releases. You can manually edit this limit by modifying the definition of the `NGX_HTTP_MAX_SUBREQUESTS` macro in the `nginx/src/http/ngx_http_request.h` file in the Nginx source tree. When you are exceeding this limit, you will get the following error message in your `error.log` file:
+There is a hard-coded upper limit on the number of concurrent subrequests possible for every main request. In older versions of Nginx, the limit was `50` concurrent subrequests and in more recent versions, Nginx `1.1.x` onwards, this was increased to `200` concurrent subrequests. When this limit is exceeded, the following error message is added to the `error.log` file:
 
 
     [error] 13983#0: *1 subrequests cycle while processing "/uri"
 
 
-Please also refer to restrictions on [capturing locations that include Echo Module directives](http://wiki.nginx.org/HttpLuaModule#Locations_With_HttpEchoModule_Directives).
+The limit can be manually modified if required by editing the definition of the `NGX_HTTP_MAX_SUBREQUESTS` macro in the `nginx/src/http/ngx_http_request.h` file in the Nginx source tree.
+
+Please also refer to restrictions on capturing locations configured by [subrequest directives of other modules](http://wiki.nginx.org/HttpLuaModule#Locations_Configured_by_Subrequest_Directives_of_Other_Modules).
 
 ngx.location.capture_multi
 --------------------------
@@ -1462,11 +1816,11 @@ of this function. Logically speaking, the [ngx.location.capture](http://wiki.ngi
         end
 
 
-Please also refer to restrictions on [capturing locations that include Echo Module directives](http://wiki.nginx.org/HttpLuaModule#Locations_With_HttpEchoModule_Directives).
+Please also refer to restrictions on capturing locations configured by [subrequest directives of other modules](http://wiki.nginx.org/HttpLuaModule#Locations_Configured_by_Subrequest_Directives_of_Other_Modules).
 
 ngx.status
 ----------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 Read and write the current request's response status. This should be called
 before sending out the response headers.
@@ -1476,15 +1830,25 @@ before sending out the response headers.
     status = ngx.status
 
 
+Setting `ngx.status` after the response header is sent out has no effect but leaving an error message in your nginx's error log file:
+
+
+    attempt to set ngx.status after sending out response headers
+
+
 ngx.header.HEADER
 -----------------
 **syntax:** *ngx.header.HEADER = VALUE*
 
 **syntax:** *value = ngx.header.HEADER*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
-Set, add to, or clear the current request `HEADER` response header. Underscores (`_`) in the header names will be replaced by dashes (`-`) and the header names will be matched case-insensitively.
+Set, add to, or clear the current request's `HEADER` response header that is to be sent.
+
+Underscores (`_`) in the header names will be replaced by hyphens (`-`) by default. This transformation can be turned off via the [lua_transform_underscores_in_response_headers](http://wiki.nginx.org/HttpLuaModule#lua_transform_underscores_in_response_headers) directive.
+
+The header names are matched case-insensitively.
 
 
     -- equivalent to ngx.header["Content-Type"] = 'text/plain'
@@ -1575,11 +1939,57 @@ Note that `ngx.header` is not a normal Lua table and as such, it is not possible
 
 For reading *request* headers, use the [ngx.req.get_headers](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_headers) function instead.
 
+ngx.req.start_time
+------------------
+**syntax:** *secs = ngx.req.start_time()*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
+
+Returns a floating-point number representing the timestamp (including milliseconds as the decimal part) when the current request was created.
+
+The following example emulates the `$request_time` variable value (provided by [HttpLogModule](http://wiki.nginx.org/HttpLogModule)) in pure Lua:
+
+
+    local request_time = ngx.now() - ngx.req.start_time()
+
+
+This function was first introduced in the `v0.7.7` release.
+
+See also [ngx.now](http://wiki.nginx.org/HttpLuaModule#ngx.now) and [ngx.update_time](http://wiki.nginx.org/HttpLuaModule#ngx.update_time).
+
+ngx.req.get_method
+------------------
+**syntax:** *method_name = ngx.req.get_method()*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+
+Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](http://wiki.nginx.org/HttpLuaModule#HTTP_method_constants).
+
+If the current request is an Nginx subrequest, then the subrequest's method name will be returned.
+
+This method was first introduced in the `v0.5.6` release.
+
+See also [ngx.req.set_method](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_method).
+
+ngx.req.set_method
+------------------
+**syntax:** *ngx.req.set_method(method_id)*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+
+Overrides the current request's request method with the `request_id` argument. Currently only numerical [method constants](http://wiki.nginx.org/HttpLuaModule#HTTP_method_constants) are supported, like `ngx.HTTP_POST` and `ngx.HTTP_GET`.
+
+If the current request is an Nginx subrequest, then the subrequest's method will be overridden.
+
+This method was first introduced in the `v0.5.6` release.
+
+See also [ngx.req.get_method](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_method).
+
 ngx.req.set_uri
 ---------------
 **syntax:** *ngx.req.set_uri(uri, jump?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua**
 
 Rewrite the current request's (parsed) URI by the `uri` argument. The `uri` argument must be a Lua string and cannot be of zero length, or a Lua exception will be thrown.
 
@@ -1666,7 +2076,7 @@ ngx.req.set_uri_args
 --------------------
 **syntax:** *ngx.req.set_uri_args(args)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua**
 
 Rewrite the current request's URI query arguments by the `args` argument. The `args` argument can be either a Lua string, as in
 
@@ -1680,7 +2090,7 @@ or a Lua table holding the query arguments' key-value pairs, as in
     ngx.req.set_uri_args({ a = 3, b = "hello world" })
 
 
-where in the latter case, this method will automatically escape argument keys and values according to the URI escaping rule.
+where in the latter case, this method will escape argument keys and values according to the URI escaping rule.
 
 Multi-value arguments are also supported:
 
@@ -1688,7 +2098,7 @@ Multi-value arguments are also supported:
     ngx.req.set_uri_args({ a = 3, b = {5, 6} })
 
 
-which will result in a querystring like `a=3&b=5&b=6`.
+which will result in a query string like `a=3&b=5&b=6`.
 
 This interface was first introduced in the `v0.3.1rc13` release.
 
@@ -1698,7 +2108,7 @@ ngx.req.get_uri_args
 --------------------
 **syntax:** *args = ngx.req.get_uri_args(max_args?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 Returns a Lua table holding all the current request URL query arguments.
 
@@ -1726,7 +2136,7 @@ Then `GET /test?foo=bar&bar=baz&bar=blah` will yield the response body
 
 Multiple occurrences of an argument key will result in a table value holding all the values for that key in order.
 
-Keys and values are automatically unescaped according to URI escaping rules. In the settings above, `GET /test?a%20b=1%61+2` will yield:
+Keys and values are unescaped according to URI escaping rules. In the settings above, `GET /test?a%20b=1%61+2` will yield:
 
 
     a b: 1a 2
@@ -1783,7 +2193,7 @@ ngx.req.get_post_args
 ---------------------
 **syntax:** *ngx.req.get_post_args(max_args?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 Returns a Lua table holding all the current request POST query arguments (of the MIME type `application/x-www-form-urlencoded`). Call [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) to read the request body first or turn on the [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) directive to avoid Lua exception errors.
 
@@ -1819,7 +2229,7 @@ will yield the response body like
 
 Multiple occurrences of an argument key will result in a table value holding all of the values for that key in order.
 
-Keys and values will be automatically unescaped according to URI escaping rules. 
+Keys and values will be unescaped according to URI escaping rules.
 
 With the settings above,
 
@@ -1868,9 +2278,9 @@ Removing the `max_args` cap is strongly discouraged.
 
 ngx.req.get_headers
 -------------------
-**syntax:** *headers = ngx.req.get_headers(max_headers?)*
+**syntax:** *headers = ngx.req.get_headers(max_headers?, raw?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
 
 Returns a Lua table holding all the current request headers.
 
@@ -1919,14 +2329,27 @@ This argument can be set to zero to remove the limit and to process all request
 
 Removing the `max_headers` cap is strongly discouraged.
 
+Since the `0.6.9` release, all the header names in the Lua table returned are converted to the pure lower-case form by default, unless the `raw` argument is set to `true` (default to `false`).
+
+Also, by default, an `__index` metamethod is added to the resulting Lua table and will normalize the keys to a pure lowercase form with all underscores converted to dashes in case of a lookup miss. For example, if a request header `My-Foo-Header` is present, then the following invocations will all pick up the value of this header correctly:
+
+
+    ngx.say(headers.my_foo_header)
+    ngx.say(headers["My-Foo-Header"])
+    ngx.say(headers["my-foo-header"])
+
+
+The `__index` metamethod will not be added when the `raw` argument is set to `true`.
+
 ngx.req.set_header
 ------------------
 **syntax:** *ngx.req.set_header(header_name, header_value)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*
 
 Set the current request's request header named `header_name` to value `header_value`, overriding any existing ones.
-None of the current request's subrequests will be affected.
+
+By default, all the subrequests subsequently initiated by [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi) will inherit the new header.
 
 Here is an example of setting the `Content-Length` header:
 
@@ -1962,6 +2385,14 @@ is equivalent to
     ngx.req.clear_header("X-Foo")
 
 
+ngx.req.clear_header
+--------------------
+**syntax:** *ngx.req.clear_header(header_name)*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua**
+
+Clear the current request's request header named `header_name`. None of the current request's subrequests will be affected.
+
 ngx.req.read_body
 -----------------
 **syntax:** *ngx.req.read_body()*
@@ -2019,7 +2450,7 @@ This function returns `nil` if
 1. the request body has been read into disk temporary files,
 1. or the request body has zero size.
 
-If the request body has not been read yet, call [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) first (or turned on [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) to force this module to read the request body automatically, but this is not recommended).
+If the request body has not been read yet, call [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) first (or turned on [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) to force this module to read the request body. This is not recommended however).
 
 If the request body has been read into disk files, try calling the [ngx.req.get_body_file](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_body_file) function instead.
 
@@ -2039,9 +2470,9 @@ ngx.req.get_body_file
 
 Retrieves the file name for the in-file request body data. Returns `nil` if the request body has not been read or has been read into memory.
 
-The returned file is read only and is usually cleaned up automatically by Nginx's memory pool. It should not be manually modified, renamed, or removed in Lua code.
+The returned file is read only and is usually cleaned up by Nginx's memory pool. It should not be manually modified, renamed, or removed in Lua code.
 
-If the request body has not been read yet, call [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) first (or turned on [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) to force this module to read the request body automatically, but this is not recommended).
+If the request body has not been read yet, call [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) first (or turned on [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) to force this module to read the request body. This is not recommended however).
 
 If the request body has been read into memory, try calling the [ngx.req.get_body_data](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_body_data) function instead.
 
@@ -2077,7 +2508,7 @@ ngx.req.set_body_file
 
 Set the current request's request body using the in-file data specified by the `file_name` argument.
 
-If the optional `auto_clean` argument is given a `true` value, then this file will be automatically removed at request completion or the next time this function or [ngx.req.set_body_data](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_body_data) are called in the same request. The `auto_clean` is default to `false`.
+If the optional `auto_clean` argument is given a `true` value, then this file will be removed at request completion or the next time this function or [ngx.req.set_body_data](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_body_data) are called in the same request. The `auto_clean` is default to `false`.
 
 Please ensure that the file specified by the `file_name` argument exists and is readable by an Nginx worker process by setting its permission properly to avoid Lua exception errors.
 
@@ -2090,6 +2521,66 @@ This function was first introduced in the `v0.3.1rc18` release.
 
 See also [ngx.req.set_body_data](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_body_data).
 
+ngx.req.init_body
+-----------------
+**syntax:** *ngx.req.init_body(buffer_size?)*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Creates a new blank request body for the current request and inializes the buffer for later request body data writing via the [ngx.req.append_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.append_body) and [ngx.req.finish_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.finish_body) APIs.
+
+If the `buffer_size` argument is specified, then its value will be used for the size of the memory buffer for body writing with [ngx.req.append_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.append_body). If the argument is omitted, then the value specified by the standard [client_body_buffer_size](http://wiki.nginx.org/HttpCoreModule#client_body_buffer_size) directive will be used instead.
+
+When the data can no longer be hold in the memory buffer for the request body, then the data will be flushed onto a temporary file just like the standard request body reader in the Nginx core.
+
+It is important to always call the [ngx.req.finish_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.finish_body) after all the data has been appended onto the current request body. Also, when this function is used together with [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket), it is required to call [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket) *before* this function, or you will get the "request body already exists" error message.
+
+The usage of this function is often like this:
+
+
+    ngx.req.init_body(128 * 1024)  -- buffer is 128KB
+    for chunk in next_data_chunk() do
+        ngx.req.append_body(chunk) -- each chunk can be 4KB
+    end
+    ngx.req.finish_body()
+
+
+This function can be used with [ngx.req.append_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.append_body), [ngx.req.finish_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.finish_body), and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket) to implement efficient input filters in pure Lua (in the context of [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua)* or [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua)*), which can be used with other Nginx content handler or upstream modules like [HttpProxyModule](http://wiki.nginx.org/HttpProxyModule) and [HttpFastcgiModule](http://wiki.nginx.org/HttpFastcgiModule).
+
+This function was first introduced in the `v0.5.11` release.
+
+ngx.req.append_body
+-------------------
+**syntax:** *ngx.req.append_body(data_chunk)*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Append new data chunk specified by the `data_chunk` argument onto the existing request body created by the [ngx.req.init_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.init_body) call.
+
+When the data can no longer be hold in the memory buffer for the request body, then the data will be flushed onto a temporary file just like the standard request body reader in the Nginx core.
+
+It is important to always call the [ngx.req.finish_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.finish_body) after all the data has been appended onto the current request body.
+
+This function can be used with [ngx.req.init_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.init_body), [ngx.req.finish_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.finish_body), and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket) to implement efficient input filters in pure Lua (in the context of [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua)* or [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua)*), which can be used with other Nginx content handler or upstream modules like [HttpProxyModule](http://wiki.nginx.org/HttpProxyModule) and [HttpFastcgiModule](http://wiki.nginx.org/HttpFastcgiModule).
+
+This function was first introduced in the `v0.5.11` release.
+
+See also [ngx.req.init_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.init_body).
+
+ngx.req.finish_body
+-------------------
+**syntax:** *ngx.req.finish_body()*
+
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Completes the construction process of the new request body created by the [ngx.req.init_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.init_body) and [ngx.req.append_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.append_body) calls.
+
+This function can be used with [ngx.req.init_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.init_body), [ngx.req.append_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.append_body), and [ngx.req.socket](http://wiki.nginx.org/HttpLuaModule#ngx.req.socket) to implement efficient input filters in pure Lua (in the context of [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua)* or [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua)*), which can be used with other Nginx content handler or upstream modules like [HttpProxyModule](http://wiki.nginx.org/HttpProxyModule) and [HttpFastcgiModule](http://wiki.nginx.org/HttpFastcgiModule).
+
+This function was first introduced in the `v0.5.11` release.
+
+See also [ngx.req.init_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.init_body).
+
 ngx.req.socket
 --------------
 **syntax:** *tcpsock, err = ngx.req.socket()*
@@ -2102,18 +2593,10 @@ In case of error, `nil` will be returned as well as a string describing the erro
 
 The socket object returned by this method is usually used to read the current request's body in a streaming fashion. Do not turn on the [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) directive, and do not mix this call with [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) and [ngx.req.discard_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.discard_body).
 
-If there is any request body data that has been preread into the Nginx core's request header buffer, the resulting cosocket object will take care of that automatically. So there will not be any data loss due to potential body data prereading.
+If any request body data has been pre-read into the Nginx core request header buffer, the resulting cosocket object will take care of this to avoid potential data loss resulting from such pre-reading.
 
 This function was first introduced in the `v0.5.0rc1` release.
 
-ngx.req.clear_header
---------------------
-**syntax:** *ngx.req.clear_header(header_name)*
-
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
-
-Clear the current request's request header named `header_name`. None of the current request's subrequests will be affected.
-
 ngx.exec
 --------
 **syntax:** *ngx.exec(uri, args?)*
@@ -2148,7 +2631,7 @@ The optional second `args` can be used to specify extra URI query arguments, for
     ngx.exec("/foo", "a=3&b=hello%20world")
 
 
-Alternatively, a Lua table can be passed for the `args` argument for ngx_lua to carry out URI escaping and string concatenation automatically.
+Alternatively, a Lua table can be passed for the `args` argument for ngx_lua to carry out URI escaping and string concatenation.
 
 
     ngx.exec("/foo", { a = 3, b = "hello world" })
@@ -2164,7 +2647,7 @@ This method never returns.
 This method *must* be called before [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers) or explicit response body
 outputs by either [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) or [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say).
 
-It's strongly recommended to combine the `return` statement with this call, i.e., `return ngx.exec(...)`.
+It is strongly recommended to combine the `return` statement with this call, i.e., `return ngx.exec(...)`.
 
 This method is similar to the [echo_exec](http://wiki.nginx.org/HttpEchoModule#echo_exec) directive of the [HttpEchoModule](http://wiki.nginx.org/HttpEchoModule).
 
@@ -2191,7 +2674,7 @@ which is equivalent to
     return ngx.redirect("http://localhost:1984/foo", ngx.HTTP_MOVED_TEMPORARILY)
 
 
-We can also use the numberical code directly as the second `status` argument:
+We can also use the numerical code directly as the second `status` argument:
 
 
     return ngx.redirect("/foo", 301)
@@ -2199,8 +2682,6 @@ We can also use the numberical code directly as the second `status` argument:
 
 This method *must* be called before [ngx.send_headers](http://wiki.nginx.org/HttpLuaModule#ngx.send_headers) or explicit response body outputs by either [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) or [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say).
 
-This method never returns.
-
 This method is very much like the [rewrite](http://wiki.nginx.org/HttpRewriteModule#rewrite) directive with the `redirect` modifier in the standard
 [HttpRewriteModule](http://wiki.nginx.org/HttpRewriteModule), for example, this `nginx.conf` snippet
 
@@ -2232,7 +2713,7 @@ URI arguments can be specified as well, for example:
     return ngx.redirect('/foo?a=3&b=4')
 
 
-It's strongly recommended to combine the `return` statement with this call, i.e., `return ngx.redirect(...)`.
+This method call terminates the current request's processing and never returns. It is recommended to combine the `return` statement with this call, i.e., `return ngx.redirect(...)`, so as to be more explicit.
 
 ngx.send_headers
 ----------------
@@ -2242,14 +2723,14 @@ ngx.send_headers
 
 Explicitly send out the response headers.
 
-Note that there is normally no need to manually send out response headers as `ngx_lua` will automatically send headers out 
+Note that there is normally no need to manually send out response headers as ngx_lua will automatically send headers out
 before content is output with [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) or [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) or when [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua) exits normally.
 
 ngx.headers_sent
 ----------------
 **syntax:** *value = ngx.headers_sent*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
 
 Returns `true` if the response headers have been sent (by ngx_lua), and `false` otherwise.
 
@@ -2300,7 +2781,7 @@ ngx.log
 -------
 **syntax:** *ngx.log(log_level, ...)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Log arguments concatenated to error.log with the given logging level.
 
@@ -2308,7 +2789,7 @@ Lua `nil` arguments are accepted and result in literal `"nil"` string while Lua
 
 The `log_level` argument can take constants like `ngx.ERR` and `ngx.WARN`. Check out [Nginx log level constants](http://wiki.nginx.org/HttpLuaModule#Nginx_log_level_constants) for details.
 
-There is a hard-coded length limitation on the error messages in the Nginx core. It is `2048` bytes at most, including the trailing newlines and the leading timestamps. You can manually modify this limit by modifying the `NGX_MAX_ERROR_STR` macro definition in the `src/core/ngx_log.h` file in the Nginx source tree. If the message size exceeds this limit, the Nginx core will truncate the message text automatically.
+There is a hard coded `2048` byte limitation on error message lengths in the Nginx core. This limit includes trailing newlines and leading time stamps. If the message size exceeds this limit, Nginx will truncate the message text accordingly. This limit can be manually modified by editing the `NGX_MAX_ERROR_STR` macro definition in the `src/core/ngx_log.h` file in the Nginx source tree.
 
 ngx.flush
 ---------
@@ -2370,7 +2851,7 @@ Number literals can be used directly as the argument, for instance,
 
 Note that while this method accepts all [HTTP status constants](http://wiki.nginx.org/HttpLuaModule#HTTP_status_constants) as input, it only accepts `NGX_OK` and `NGX_ERROR` of the [core constants](http://wiki.nginx.org/HttpLuaModule#core_constants).
 
-It's strongly recommended to combine the `return` statement with this call, i.e., `return ngx.exit(...)`.
+It is recommended, though not necessary, to combine the `return` statement with this call, i.e., `return ngx.exit(...)`, to give a visual hint to others reading the code.
 
 ngx.eof
 -------
@@ -2378,13 +2859,44 @@ ngx.eof
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-Explicitly specify the end of the response output stream.
+Explicitly specify the end of the response output stream. In the case of HTTP 1.1 chunked encoded output, it will just trigger the Nginx core to send out the "last chunk".
+
+When you disable the HTTP 1.1 keep-alive feature for your downstream connections, you can rely on descent HTTP clients to close the connection actively for you when you call this method. This trick can be used do back-ground jobs without letting the HTTP clients to wait on the connection, as in the following example:
+
+
+    location = /async {
+        keepalive_timeout 0;
+        content_by_lua '
+            ngx.say("got the task!")
+            ngx.eof()  -- descent HTTP client will close the connection at this point
+            -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
+        ';
+    }
+
+
+But if you create subrequests to access other locations configured by Nginx upstream modules, then you should configure those upstream modules to ignore client connection abortions if they are not by default. For example, by default the standard [HttpProxyModule](http://wiki.nginx.org/HttpProxyModule) will terminate both the subrequest and the main request as soon as the client closes the connection, so it is important to turn on the [proxy_ignore_client_abort](http://wiki.nginx.org/HttpProxyModule#proxy_ignore_client_abort) directive in your location block configured by [HttpProxyModule](http://wiki.nginx.org/HttpProxyModule):
+
+
+    proxy_ignore_client_abort on;
+
+
+ngx.sleep
+---------
+**syntax:** *ngx.sleep(seconds)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Sleeps for the specified seconds without blocking. One can specify time resolution up to 0.001 seconds (i.e., one milliseconds).
+
+Behind the scene, this method makes use of the Nginx timers.
+
+This method was introduced in the `0.5.0rc30` release.
 
 ngx.escape_uri
 --------------
 **syntax:** *newstr = ngx.escape_uri(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Escape `str` as a URI component.
 
@@ -2392,7 +2904,7 @@ ngx.unescape_uri
 ----------------
 **syntax:** *newstr = ngx.unescape_uri(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Unescape `str` as an escaped URI component.
 
@@ -2412,7 +2924,7 @@ ngx.encode_args
 ---------------
 **syntax:** *str = ngx.encode_args(table)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Encode the Lua table to a query args string according to the URI encoded rules.
 
@@ -2430,7 +2942,7 @@ yields
 
 The table keys must be Lua strings.
 
-Multi-value query args are also supported. Just use a Lua table for the arg's value, for example:
+Multi-value query args are also supported. Just use a Lua table for the argument's value, for example:
 
 
     ngx.encode_args({baz = {32, "hello"}})
@@ -2464,11 +2976,11 @@ ngx.decode_args
 ---------------
 **syntax:** *table = ngx.decode_args(str, max_args?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [ngx.encode_args](http://wiki.nginx.org/HttpLuaModule#ngx.encode_args).
 
-The optional `max_args` argument can be used to specify the maximalnumber of arguments parsed from the `str` argument. By default, a maximum of 100 request arguments are parsed (including those with the same name) and that additional URI arguments are silently discarded to guard against potential denial of service attacks.
+The optional `max_args` argument can be used to specify the maximum number of arguments parsed from the `str` argument. By default, a maximum of 100 request arguments are parsed (including those with the same name) and that additional URI arguments are silently discarded to guard against potential denial of service attacks.
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
@@ -2484,7 +2996,7 @@ ngx.encode_base64
 -----------------
 **syntax:** *newstr = ngx.encode_base64(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Encode `str` to a base64 digest.
 
@@ -2492,7 +3004,7 @@ ngx.decode_base64
 -----------------
 **syntax:** *newstr = ngx.decode_base64(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Decodes the `str` argument as a base64 digest to the raw form. Returns `nil` if `str` is not well formed.
 
@@ -2500,7 +3012,7 @@ ngx.crc32_short
 ---------------
 **syntax:** *intval = ngx.crc32_short(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -2514,7 +3026,7 @@ ngx.crc32_long
 --------------
 **syntax:** *intval = ngx.crc32_long(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -2528,7 +3040,7 @@ ngx.hmac_sha1
 -------------
 **syntax:** *digest = ngx.hmac_sha1(secret_key, str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Computes the [HMAC-SHA1](http://en.wikipedia.org/wiki/HMAC) digest of the argument `str` and turns the result using the secret key `<secret_key>`.
 
@@ -2549,7 +3061,7 @@ yields the output
     R/pvxzHC4NLtj7S+kXFg/NePTmk=
 
 
-This API requires the OpenSSL library enabled in the Nignx build (usually by passing the `--with-http_ssl_module` option to the `./configure` script).
+This API requires the OpenSSL library enabled in the Nginx build (usually by passing the `--with-http_ssl_module` option to the `./configure` script).
 
 This function was first introduced in the `v0.3.1rc29` release.
 
@@ -2557,7 +3069,7 @@ ngx.md5
 -------
 **syntax:** *digest = ngx.md5(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Returns the hexadecimal representation of the MD5 digest of the `str` argument.
 
@@ -2581,7 +3093,7 @@ ngx.md5_bin
 -----------
 **syntax:** *digest = ngx.md5_bin(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Returns the binary form of the MD5 digest of the `str` argument.
 
@@ -2591,11 +3103,11 @@ ngx.sha1_bin
 ------------
 **syntax:** *digest = ngx.sha1_bin(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Returns the binary form of the SHA-1 digest of the `str` argument.
 
-This function requires enabling SHA-1 support in your Nginx build (usually you just need to install OpenSSL to your system while building Nginx).
+This function requires SHA-1 support in the Nginx build. (This usually just means OpenSSL should be installed while building Nginx).
 
 This function was first introduced in the `v0.5.0rc6`.
 
@@ -2603,7 +3115,7 @@ ngx.today
 ---------
 **syntax:** *str = ngx.today()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Returns current date (in the format `yyyy-mm-dd`) from the nginx cached time (no syscall involved unlike Lua's date library).
 
@@ -2613,9 +3125,9 @@ ngx.time
 --------
 **syntax:** *secs = ngx.time()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Returns the elapsed seconds from the epoch for the current timestamp from the nginx cached time (no syscall involved unlike Lua's date library).
+Returns the elapsed seconds from the epoch for the current time stamp from the nginx cached time (no syscall involved unlike Lua's date library).
 
 Updates of the Nginx time cache an be forced by calling [ngx.update_time](http://wiki.nginx.org/HttpLuaModule#ngx.update_time) first.
 
@@ -2623,11 +3135,11 @@ ngx.now
 -------
 **syntax:** *secs = ngx.now()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Returns a floating-point number for the elapsed time in seconds (including microseconds as the decimal part) from the epoch for the current timestamp from the nginx cached time (no syscall involved unlike Lua's date library).
+Returns a floating-point number for the elapsed time in seconds (including milliseconds as the decimal part) from the epoch for the current time stamp from the nginx cached time (no syscall involved unlike Lua's date library).
 
-Use the Nginx core [timer_resolution](http://wiki.nginx.org/CoreModule#timer_resolution) directive to adjust the accuracy or forcibly update the Nginx time cache by calling [ngx.update_time](http://wiki.nginx.org/HttpLuaModule#ngx.update_time) first.
+You can forcibly update the Nginx time cache by calling [ngx.update_time](http://wiki.nginx.org/HttpLuaModule#ngx.update_time) first.
 
 This API was first introduced in `v0.3.1rc32`.
 
@@ -2635,7 +3147,7 @@ ngx.update_time
 ---------------
 **syntax:** *ngx.update_time()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -2645,9 +3157,9 @@ ngx.localtime
 -------------
 **syntax:** *str = ngx.localtime()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Returns the current timestamp (in the format `yyyy-mm-dd hh:mm:ss`) of the nginx cached time (no syscall involved unlike Lua's [os.date](http://www.lua.org/manual/5.1/manual.html#pdf-os.date) function).
+Returns the current time stamp (in the format `yyyy-mm-dd hh:mm:ss`) of the nginx cached time (no syscall involved unlike Lua's [os.date](http://www.lua.org/manual/5.1/manual.html#pdf-os.date) function).
 
 This is the local time.
 
@@ -2655,9 +3167,9 @@ ngx.utctime
 -----------
 **syntax:** *str = ngx.utctime()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Returns the current timestamp (in the format `yyyy-mm-dd hh:mm:ss`) of the nginx cached time (no syscall involved unlike Lua's [os.date](http://www.lua.org/manual/5.1/manual.html#pdf-os.date) function).
+Returns the current time stamp (in the format `yyyy-mm-dd hh:mm:ss`) of the nginx cached time (no syscall involved unlike Lua's [os.date](http://www.lua.org/manual/5.1/manual.html#pdf-os.date) function).
 
 This is the UTC time.
 
@@ -2665,9 +3177,9 @@ ngx.cookie_time
 ---------------
 **syntax:** *str = ngx.cookie_time(sec)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Returns a formated string can be used as the cookie expiration time. The parameter `sec` is the timestamp in seconds (like those returned from [ngx.time](http://wiki.nginx.org/HttpLuaModule#ngx.time)).
+Returns a formated string can be used as the cookie expiration time. The parameter `sec` is the time stamp in seconds (like those returned from [ngx.time](http://wiki.nginx.org/HttpLuaModule#ngx.time)).
 
 
     ngx.say(ngx.cookie_time(1290079655))
@@ -2678,9 +3190,9 @@ ngx.http_time
 -------------
 **syntax:** *str = ngx.http_time(sec)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Returns a formated string can be used as the http header time (for example, being used in `Last-Modified` header). The parameter `sec` is the timestamp in seconds (like those returned from [ngx.time](http://wiki.nginx.org/HttpLuaModule#ngx.time)).
+Returns a formated string can be used as the http header time (for example, being used in `Last-Modified` header). The parameter `sec` is the time stamp in seconds (like those returned from [ngx.time](http://wiki.nginx.org/HttpLuaModule#ngx.time)).
 
 
     ngx.say(ngx.http_time(1290079655))
@@ -2691,7 +3203,7 @@ ngx.parse_http_time
 -------------------
 **syntax:** *sec = ngx.parse_http_time(str)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Parse the http time string (as returned by [ngx.http_time](http://wiki.nginx.org/HttpLuaModule#ngx.http_time)) into seconds. Returns the seconds or `nil` if the input string is in bad forms.
 
@@ -2706,7 +3218,7 @@ ngx.is_subrequest
 -----------------
 **syntax:** *value = ngx.is_subrequest*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Returns `true` if the current request is an nginx subrequest, or `false` otherwise.
 
@@ -2714,13 +3226,13 @@ ngx.re.match
 ------------
 **syntax:** *captures = ngx.re.match(subject, regex, options?, ctx?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Matches the `subject` string using the Perl-compatible regular expression `regex` with the optional `options`.
+Matches the `subject` string using the Perl compatible regular expression `regex` with the optional `options`.
 
 Only the first occurrence of the match is returned, or `nil` if no match is found. In case of fatal errors, like seeing bad `UTF-8` sequences in `UTF-8` mode, a Lua exception will be raised.
 
-When a match is found, a Lua table `captures` is returned, where `captures[0]` holds the whole substring being matched, and `captures[1]` holds the first parenthesized subpattern's capturing, `captures[2]` the second, and so on.
+When a match is found, a Lua table `captures` is returned, where `captures[0]` holds the whole substring being matched, and `captures[1]` holds the first parenthesized sub-pattern's capturing, `captures[2]` the second, and so on.
 
 
     local m = ngx.re.match("hello, 1234", "[0-9]+")
@@ -2733,7 +3245,7 @@ When a match is found, a Lua table `captures` is returned, where `captures[0]` h
     -- m[1] == "1"
 
 
-Unmatched subpatterns will have `nil` values in their `captures` table fields.
+Unmatched sub-patterns will have `nil` values in their `captures` table fields.
 
 
     local m = ngx.re.match("hello, world", "(world)|(hello)")
@@ -2751,17 +3263,16 @@ Specify `options` to control how the match operation will be performed. The foll
                   this requires PCRE 6.0+ or else a Lua exception will be thrown.
                   first introduced in ngx_lua v0.3.1rc30.
 
-    i             caseless mode (similar to Perl's /i modifier)
+    i             case insensitive mode (similar to Perl's /i modifier)
 
     j             enable PCRE JIT compilation, this requires PCRE 8.21+ which
-                  must be built with the --enable-jit option.
-                  for optimum performance, this option should always be used  
-                  together with the 'o' option.
+                  must be built with the --enable-jit option. for optimum performance,
+                  this option should always be used together with the 'o' option.
                   first introduced in ngx_lua v0.3.1rc30.
 
     m             multi-line mode (similar to Perl's /m modifier)
 
-    o             compile-once mode (similar to Perl's /o modifer),
+    o             compile-once mode (similar to Perl's /o modifier),
                   to enable the worker-process-level compiled-regex cache
 
     s             single-line mode (similar to Perl's /s modifier)
@@ -2809,7 +3320,7 @@ Note that, the `options` argument is not optional when the `ctx` argument is spe
 
 This method requires the PCRE library enabled in Nginx.  ([Known Issue With Special PCRE Sequences](http://wiki.nginx.org/HttpLuaModule#Special_PCRE_Sequences)).
 
-To confirm that PCRE JIT is indeed enabled, it's required to enable the debugging logs in your Nginx build (by passing the `--with-debug` option to your Nginx or ngx_openresty's `./configure` script) and enable the "debug" error log level in your `error_log` directive, and then you can see the following message if PCRE JIT actually works:
+To confirm that PCRE JIT is enabled, activate the Nginx debug log by adding the `--with-debug` option to Nginx or ngx_openresty's `./configure` script. Then, enable the "debug" error log level in `error_log` directive. The following message will be generated if PCRE JIT is enabled:
 
 
     pcre JIT compiling result: 1
@@ -2821,11 +3332,11 @@ ngx.re.gmatch
 -------------
 **syntax:** *iterator = ngx.re.gmatch(subject, regex, options?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Similar to [ngx.re.match](http://wiki.nginx.org/HttpLuaModule#ngx.re.match), but returns a Lua iterator instead, so as to let the user programmer iterate all the matches over the `<subject>` string argument with the PCRE `regex`.
 
-Here is a small exmple to demonstrate its basic usage:
+Here is a small example to demonstrate its basic usage:
 
 
     local iterator = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
@@ -2856,9 +3367,9 @@ ngx.re.sub
 ----------
 **syntax:** *newstr, n = ngx.re.sub(subject, regex, replace, options?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
-Substitutes the first match of the Perl-compatible regular expression `regex` on the `subject` argument string with the string or function argument `replace`. The optional `options` argument has exactly the same meaning as in [ngx.re.match](http://wiki.nginx.org/HttpLuaModule#ngx.re.match).
+Substitutes the first match of the Perl compatible regular expression `regex` on the `subject` argument string with the string or function argument `replace`. The optional `options` argument has exactly the same meaning as in [ngx.re.match](http://wiki.nginx.org/HttpLuaModule#ngx.re.match).
 
 This method returns the resulting new string as well as the number of successful substitutions, or throw out a Lua exception when an error occurred (syntax errors in the `<replace>` string argument, for example).
 
@@ -2911,7 +3422,7 @@ ngx.re.gsub
 -----------
 **syntax:** *newstr, n = ngx.re.gsub(subject, regex, replace, options?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Just like [ngx.re.sub](http://wiki.nginx.org/HttpLuaModule#ngx.re.sub), but does global substitution.
 
@@ -2940,7 +3451,7 @@ ngx.shared.DICT
 ---------------
 **syntax:** *dict = ngx.shared.DICT*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Fetching the shm-based Lua dictionary object for the shared memory zone named `DICT` defined by the [lua_shared_dict](http://wiki.nginx.org/HttpLuaModule#lua_shared_dict) directive.
 
@@ -2953,6 +3464,7 @@ The resulting object `dict` has the following methods:
 * [incr](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.incr)
 * [delete](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.delete)
 * [flush_all](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.flush_all)
+* [flush_expired](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.flush_expired)
 
 Here is an example:
 
@@ -3002,7 +3514,7 @@ ngx.shared.DICT.get
 -------------------
 **syntax:** *value, flags = ngx.shared.DICT:get(key)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Retrieving the value in the dictionary [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT) for the key `key`. If the key does not exist or has been expired, then `nil` will be returned.
 
@@ -3034,7 +3546,7 @@ ngx.shared.DICT.set
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:set(key, value, exptime?, flags?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Unconditionally sets a key-value pair into the shm-based dictionary [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT). Returns three values:
 
@@ -3070,13 +3582,15 @@ These two forms are fundamentally equivalent.
 
 This feature was first introduced in the `v0.3.1rc22` release.
 
+Please note that while internally the key-value pair is set atomically, the atomicity does not go across the method call boundary.
+
 See also [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
 
 ngx.shared.DICT.add
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:add(key, value, exptime?, flags?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Just like the [set](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.set) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT) if the key does *not* exist.
 
@@ -3090,7 +3604,7 @@ ngx.shared.DICT.replace
 -----------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:replace(key, value, exptime?, flags?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Just like the [set](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.set) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT) if the key *does* exist.
 
@@ -3104,7 +3618,7 @@ ngx.shared.DICT.delete
 ----------------------
 **syntax:** *ngx.shared.DICT:delete(key)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Unconditionally removes the key-value pair from the shm-based dictionary [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
 
@@ -3118,7 +3632,7 @@ ngx.shared.DICT.incr
 --------------------
 **syntax:** *newval, err = ngx.shared.DICT:incr(key, value)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Increments the (numerical) value for `key` in the shm-based dictionary [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT) by the step value `value`. Returns the new resulting number if the operation is successfully completed or `nil` and an error message otherwise.
 
@@ -3136,13 +3650,185 @@ ngx.shared.DICT.flush_all
 -------------------------
 **syntax:** *ngx.shared.DICT:flush_all()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 Flushes out all the items in the dictionary.
 
 This feature was first introduced in the `v0.5.0rc17` release.
 
-See also [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
+See also [ngx.shared.DICT.flush_expired](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.flush_expired) and [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
+
+ngx.shared.DICT.flush_expired
+-----------------------------
+**syntax:** *flushed = ngx.shared.DICT:flush_expired(max_count?)*
+
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
+
+Flushes out the expired items in the dictionary, up to the maximal number specified by the optional `max_count` argument. When the `max_count` argument is given `0` or not given at all, then it means unlimited. Returns the number of items that have actually been flushed.
+
+This feature was first introduced in the `v0.6.3` release.
+
+See also [ngx.shared.DICT.flush_all](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT.flush_all) and [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
+
+ngx.shared.DICT.get_keys
+------------------------
+**syntax:** *keys = ngx.shared.DICT:get_keys(max_count?)*
+
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
+
+Fetch a list of the keys from the dictionary, up to `<max_count>`.
+
+By default, only the first 1024 keys (if any) are returned. When the `<max_count>` argument is given the value `0`, then all the keys will be returned even there is more than 1024 keys in the dictionary.
+
+**WARNING** Be careful when calling this method on dictionaries with a really huge number of keys. This method may lock the dictionary for quite a while and block all the nginx worker processes that are trying to access the dictionary.
+
+This feature was first introduced in the `v0.7.3` release.
+
+ngx.socket.udp
+--------------
+**syntax:** *udpsock = ngx.socket.udp()*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Creates and returns a UDP or datagram-oriented unix domain socket object (also known as one type of the "cosocket" objects). The following methods are supported on this object:
+
+* [setpeername](http://wiki.nginx.org/HttpLuaModule#udpsock:setpeername)
+* [send](http://wiki.nginx.org/HttpLuaModule#udpsock:send)
+* [receive](http://wiki.nginx.org/HttpLuaModule#udpsock:receive)
+* [close](http://wiki.nginx.org/HttpLuaModule#udpsock:close)
+* [settimeout](http://wiki.nginx.org/HttpLuaModule#udpsock:settimeout)
+
+It is intended to be compatible with the UDP API of the [LuaSocket](http://w3.impa.br/~diego/software/luasocket/udp.html) library but is 100% nonblocking out of the box.
+
+This feature was first introduced in the `v0.5.7` release.
+
+See also [ngx.socket.tcp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.tcp).
+
+udpsock:setpeername
+-------------------
+**syntax:** *ok, err = udpsock:setpeername(host, port)*
+
+**syntax:** *ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Attempts to connect a UDP socket object to a remote server or to a datagram unix domain socket file. Because the datagram protocol is actually connection-less, this method does not really establish a "connection", but only just set the name of the remote peer for subsequent read/write operations.
+
+Both IP addresses and domain names can be specified as the `host` argument. In case of domain names, this method will use Nginx core's dynamic resolver to parse the domain name without blocking and it is required to configure the [resolver](http://wiki.nginx.org/HttpCoreModule#resolver) directive in the `nginx.conf` file like this:
+
+
+    resolver 8.8.8.8;  # use Google's public DNS nameserver
+
+
+If the nameserver returns multiple IP addresses for the host name, this method will pick up one randomly.
+
+In case of error, the method returns `nil` followed by a string describing the error. In case of success, the method returns `1`.
+
+Here is an example for connecting to a UDP (memcached) server:
+
+
+    location /test {
+        resolver 8.8.8.8;
+
+        content_by_lua '
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("my.memcached.server.domain", 11211)
+            if not ok then
+                ngx.say("failed to connect to memcached: ", err)
+                return
+            end
+            ngx.say("successfully connected to memcached!")
+            sock:close()
+        ';
+    }
+
+
+Connecting to a datagram unix domain socket file is also possible:
+
+
+    local sock = ngx.socket.udp()
+    local ok, err = sock:setpeername("unix:/tmp/some-datagram-service.sock")
+    if not ok then
+        ngx.say("failed to connect to the datagram unix domain socket: ", err)
+        return
+    end
+
+
+assuming the datagram service is listening on the unix domain socket file `/tmp/some-datagram-service.sock`.
+
+Calling this method on an already connected socket object will cause the original connection to be closed first.
+
+This method was first introduced in the `v0.5.7` release.
+
+udpsock:send
+------------
+**syntax:** *ok, err = udpsock:send(data)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Sends data on the current UDP or datagram unix domain socket object.
+
+In case of success, it returns `1`. Otherwise, it returns `nil` and a string describing the error.
+
+The input argument `data` can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
+
+This feature was first introduced in the `v0.5.7` release.
+
+udpsock:receive
+---------------
+**syntax:** *data, err = udpsock:receive(size?)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Receives data from the UDP or datagram unix domain socket object with an optional receive buffer size argument, `size`.
+
+This method is a synchronous operation and is 100% nonblocking.
+
+In case of success, it returns the data received; in case of error, it returns `nil` with a string describing the error.
+
+If the `size` argument is specified, then this method will use this size as the receive buffer size. But when this size is greater than `8192`, then `8192` will be used instead.
+
+If no argument is specified, then the maximal buffer size, `8192` is assumed.
+
+Timeout for the reading operation is controlled by the [lua_socket_read_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_read_timeout) config directive and the [settimeout](http://wiki.nginx.org/HttpLuaModule#udpsock:settimeout) method. And the latter takes priority. For example:
+
+
+    sock:settimeout(1000)  -- one second timeout
+    local data, err = sock:receive()
+    if not data then
+        ngx.say("failed to read a packet: ", data)
+        return
+    end
+    ngx.say("successfully read a packet: ", data)
+
+
+It is important here to call the [settimeout](http://wiki.nginx.org/HttpLuaModule#udpsock:settimeout) method *before* calling this method.
+
+This feature was first introduced in the `v0.5.7` release.
+
+udpsock:close
+-------------
+**syntax:** *ok, err = udpsock:close()*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Closes the current UDP or datagram unix domain socket. It returns the `1` in case of success and returns `nil` with a string describing the error otherwise.
+
+Socket objects that have not invoked this method (and associated connections) will be closed when the socket object is released by the Lua GC (Garbage Collector) or the current client HTTP request finishes processing.
+
+This feature was first introduced in the `v0.5.7` release.
+
+udpsock:settimeout
+------------------
+**syntax:** *udpsock:settimeout(time)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Set the timeout value in milliseconds for subsequent socket operations (like [receive](http://wiki.nginx.org/HttpLuaModule#udpsock:receive)).
+
+Settings done by this method takes priority over those config directives, like [lua_socket_read_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_read_timeout).
+
+This feature was first introduced in the `v0.5.7` release.
 
 ngx.socket.tcp
 --------------
@@ -3150,7 +3836,7 @@ ngx.socket.tcp
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-Creates and returns a TCP (or Unix Domain) socket object (also known as the "cosocket" object). The following methods are supported on this object:
+Creates and returns a TCP or stream-oriented unix domain socket object (also known as one type of the "cosocket" objects). The following methods are supported on this object:
 
 * [connect](http://wiki.nginx.org/HttpLuaModule#tcpsock:connect)
 * [send](http://wiki.nginx.org/HttpLuaModule#tcpsock:send)
@@ -3166,19 +3852,21 @@ It is intended to be compatible with the TCP API of the [LuaSocket](http://w3.im
 
 This feature was first introduced in the `v0.5.0rc1` release.
 
+See also [ngx.socket.udp](http://wiki.nginx.org/HttpLuaModule#ngx.socket.udp).
+
 tcpsock:connect
 ---------------
-**syntax:** *ok, err = tcpsock:connect(host, port)*
+**syntax:** *ok, err = tcpsock:connect(host, port, options_table?)*
 
-**syntax:** *ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket")*
+**syntax:** *ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket", options_table?)*
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-Attempts to connect a TCP socket object to a remote server or to a unix domain socket file nonblockingly.
+Attempts to connect a TCP socket object to a remote server or to a stream unix domain socket file without blocking.
 
 Before actually resolving the host name and connecting to the remote backend, this method will always look up the connection pool for matched idle connections created by previous calls of this method (or the [ngx.socket.connect](http://wiki.nginx.org/HttpLuaModule#ngx.socket.connect) function).
 
-Both IP addresses and domain names can be specified as the `host` argument. In case of domain names, this method will use Nginx core's dynamic resolver to parse the domain name nonblockingly and it is required to configure the [resolver](http://wiki.nginx.org/HttpCoreModule#resolver) directive in your `nginx.conf` file like this:
+Both IP addresses and domain names can be specified as the `host` argument. In case of domain names, this method will use Nginx core's dynamic resolver to parse the domain name without blocking and it is required to configure the [resolver](http://wiki.nginx.org/HttpCoreModule#resolver) directive in the `nginx.conf` file like this:
 
 
     resolver 8.8.8.8;  # use Google's public DNS nameserver
@@ -3218,7 +3906,7 @@ Connecting to a Unix Domain Socket file is also possible:
     end
 
 
-assuming that your memcached (or something else) is listening on the unix domain socket file `/tmp/memcached.sock`.
+assuming memcached (or something else) is listening on the unix domain socket file `/tmp/memcached.sock`.
 
 Timeout for the connecting operation is controlled by the [lua_socket_connect_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_connect_timeout) config directive and the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method. And the latter takes priority. For example:
 
@@ -3232,7 +3920,14 @@ It is important here to call the [settimeout](http://wiki.nginx.org/HttpLuaModul
 
 Calling this method on an already connected socket object will cause the original connection to be closed first.
 
-This feature was first introduced in the `v0.5.0rc1` release.
+An optional Lua table can be specified as the last argument to this method to specify various connect options:
+
+* `pool`
+	specify a custom name for the connection pool being used. If omitted, then the connection pool name will be generated from the string template `"<host>:<port>"` or `"<unix-socket-path>"`.
+
+The support for the options table argument was first introduced in the `v0.5.7` release.
+
+This method was first introduced in the `v0.5.0rc1` release.
 
 tcpsock:send
 ------------
@@ -3240,13 +3935,13 @@ tcpsock:send
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-Sends data nonblockingly on the current TCP or Unix Domain Socket connection.
+Sends data without blocking on the current TCP or Unix Domain Socket connection.
 
 This method is a synchronous operation that will not return until *all* the data has been flushed into the system socket send buffer or an error occurs.
 
 In case of success, it returns the total number of bytes that have been sent. Otherwise, it returns `nil` and a string describing the error.
 
-The input argument `data` can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will automatically copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
+The input argument `data` can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
 
 Timeout for the sending operation is controlled by the [lua_socket_send_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_send_timeout) config directive and the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method. And the latter takes priority. For example:
 
@@ -3300,7 +3995,7 @@ This feature was first introduced in the `v0.5.0rc1` release.
 
 tcpsock:receiveuntil
 --------------------
-**syntax:** *iterator = tcpsock:receiveuntil(pattern)*
+**syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
@@ -3323,7 +4018,7 @@ In case of error, the iterator function will return `nil` along with a string de
 
 The iterator function can be called multiple times and can be mixed safely with other cosocket method calls or other iterator function calls.
 
-The iterator function behaves differently (i.e., like a real iterator) when it is called with a `size` argument. That is, it will read that `size` of data at earch invocation and will return `nil` at the last invocation (either sees the boundary pattern or meets an error). For the last successful invocation of the iterator function, the `err` return value will be `nil` too. The iterator function will automatically reset after its last successful invocation that returns `nil` data and `nil` error. Consider the following example:
+The iterator function behaves differently (i.e., like a real iterator) when it is called with a `size` argument. That is, it will read that `size` of data on each invocation and will return `nil` at the last invocation (either sees the boundary pattern or meets an error). For the last successful invocation of the iterator function, the `err` return value will be `nil` too. The iterator function will be reset after the last successful invocation that returns `nil` data and `nil` error. Consider the following example:
 
 
     local reader = sock:receiveuntil("\r\n--abcedhb")
@@ -3355,7 +4050,7 @@ Then for the incoming data stream `'hello, world! -agentzh\r\n--abcedhb blah bla
     read done
 
 
-Note that, the actual data returned *might* be a little longer than the size limit specified by the `size` argument when your boundary pattern has ambiguity for streaming parsing. Near the boundary of the data stream, the data string actually returned could also be shorter than the size limit.
+Note that, the actual data returned *might* be a little longer than the size limit specified by the `size` argument when the boundary pattern has ambiguity for streaming parsing. Near the boundary of the data stream, the data string actually returned could also be shorter than the size limit.
 
 Timeout for the iterator function's reading operation is controlled by the [lua_socket_read_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_read_timeout) config directive and the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method. And the latter takes priority. For example:
 
@@ -3373,7 +4068,21 @@ Timeout for the iterator function's reading operation is controlled by the [lua_
 
 It is important here to call the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method *before* calling the iterator function (note that the `receiveuntil` call is irrelevant here).
 
-This feature was first introduced in the `v0.5.0rc1` release.
+As from the `v0.5.1` release, this method also takes an optional `options` table argument to control the behavior. The following options are supported:
+
+* `inclusive`
+
+The `inclusive` takes a boolean value to control whether to include the pattern string in the returned data string. Default to `false`. For example,
+
+
+    local reader = tcpsock:receiveuntil("_END_", { inclusive = true })
+    local data = reader()
+    ngx.say(data)
+
+
+Then for the input data stream `"hello world _END_ blah blah blah"`, then the example above will output `hello world _END_`, including the pattern string `_END_` itself.
+
+This method was first introduced in the `v0.5.0rc1` release.
 
 tcpsock:close
 -------------
@@ -3381,11 +4090,11 @@ tcpsock:close
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-Closes the current TCP or Unix Domain socket. It returns the `1` in case of success and returns `nil` with a string describing the error otherwise.
+Closes the current TCP or stream unix domain socket. It returns the `1` in case of success and returns `nil` with a string describing the error otherwise.
 
-For socket objects that have invoked the [setkeepalive](http://wiki.nginx.org/HttpLuaModule#tcpsock:setkeepalive) method, there is no need to call this method on it because the socket object is already closed (and the current connection is saved into the builtin connection pool).
+Note that there is no need to call this method on socket objects that have invoked the [setkeepalive](http://wiki.nginx.org/HttpLuaModule#tcpsock:setkeepalive) method because the socket object is already closed (and the current connection is saved into the built-in connection pool).
 
-For socket objects that have not invoked [setkeepalive](http://wiki.nginx.org/HttpLuaModule#tcpsock:setkeepalive), they (and their connections) will be automatically closed when the socket object is released by the Lua GC (Garbage Collector) or the current client HTTP request finishes processing.
+Socket objects that have not invoked this method (and associated connections) will be closed when the socket object is released by the Lua GC (Garbage Collector) or the current client HTTP request finishes processing.
 
 This feature was first introduced in the `v0.5.0rc1` release.
 
@@ -3419,13 +4128,13 @@ tcpsock:setkeepalive
 
 **context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
 
-Puts the current socket's connection into the cosocket built-in connection pool and keep it alive until other [connect](http://wiki.nginx.org/HttpLuaModule#tcpsock:connect) method calls request it or the associated maximal idle timeout is expired.
+Puts the current socket's connection immediately into the cosocket built-in connection pool and keep it alive until other [connect](http://wiki.nginx.org/HttpLuaModule#tcpsock:connect) method calls request it or the associated maximal idle timeout is expired.
 
 The first optional argument, `timeout`, can be used to specify the maximal idle timeout (in milliseconds) for the current connection. If omitted, the default setting in the [lua_socket_keepalive_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_keepalive_timeout) config directive will be used. If the `0` value is given, then the timeout interval is unlimited.
 
 The second optional argument, `size`, can be used to specify the maximal number of connections allowed in the connection pool for the current server (i.e., the current host-port pair or the unix domain socket file path). Note that the size of the connection pool cannot be changed once the pool is created. When this argument is omitted, the default setting in the [lua_socket_pool_size](http://wiki.nginx.org/HttpLuaModule#lua_socket_pool_size) config directive will be used.
 
-When the connection pool is exceeding the size limit, the least recently used (idle) connection already in the pool will be closed automatically to make room for the current connection.
+When the connection pool exceeds the available size limit, the least recently used (idle) connection already in the pool will be closed to make room for the current connection.
 
 Note that the cosocket connection pool is per Nginx worker process rather than per Nginx server instance, so the size limit specified here also applies to every single Nginx worker process.
 
@@ -3433,7 +4142,7 @@ Idle connections in the pool will be monitored for any exceptional events like c
 
 In case of success, this method returns `1`; otherwise, it returns `nil` and a string describing the error.
 
-This method also makes the current cosocket object enter the "closed" state, so you do not need to manually call the [close](http://wiki.nginx.org/HttpLuaModule#tcpsock:close) method on it afterwards.
+This method also makes the current cosocket object enter the "closed" state, so there is no need to manually call the [close](http://wiki.nginx.org/HttpLuaModule#tcpsock:close) method on it afterwards.
 
 This feature was first introduced in the `v0.5.0rc1` release.
 
@@ -3468,15 +4177,375 @@ This function is a shortcut for combining [ngx.socket.tcp()](http://wiki.nginx.o
     return sock
 
 
-There is no way to use the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method to specify connecting timeout for this method. You have to use the [lua_socket_connect_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_connect_timeout) directive at configure time instead.
+There is no way to use the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method to specify connecting timeout for this method and the [lua_socket_connect_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_connect_timeout) directive must be set at configure time instead.
 
 This feature was first introduced in the `v0.5.0rc1` release.
 
+ngx.get_phase
+-------------
+**syntax:** *str = ngx.get_phase()*
+
+**context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
+
+Retrieves the current running phase name. Possible return values are
+
+* `init`
+	for the context of [init_by_lua](http://wiki.nginx.org/HttpLuaModule#init_by_lua) or [init_by_lua_file](http://wiki.nginx.org/HttpLuaModule#init_by_lua_file).
+* `set`
+	for the context of [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua) or [set_by_lua_file](http://wiki.nginx.org/HttpLuaModule#set_by_lua_file).
+* `rewrite`
+	for the context of [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) or [rewrite_by_lua_file](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua_file).
+* `access`
+	for the context of [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua) or [access_by_lua_file](http://wiki.nginx.org/HttpLuaModule#access_by_lua_file).
+* `content`
+	for the context of [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua) or [content_by_lua_file](http://wiki.nginx.org/HttpLuaModule#content_by_lua_file).
+* `header_filter`
+	for the context of [header_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua) or [header_filter_by_lua_file](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua_file).
+* `body_filter`
+	for the context of [body_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#body_filter_by_lua) or [body_filter_by_lua_file](http://wiki.nginx.org/HttpLuaModule#body_filter_by_lua_file).
+* `log`
+	for the context of [log_by_lua](http://wiki.nginx.org/HttpLuaModule#log_by_lua) or [log_by_lua_file](http://wiki.nginx.org/HttpLuaModule#log_by_lua_file).
+
+This API was first introduced in the `v0.5.10` release.
+
+coroutine.create
+----------------
+**syntax:** *co = coroutine.create(f)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Creates a user Lua coroutines with a Lua function, and returns a coroutine object.
+
+Similar to the standard Lua [coroutine.create](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.create) API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the `v0.6.0` release.
+
+coroutine.resume
+----------------
+**syntax:** *ok, ... = coroutine.resume(co, ...)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Resumes the executation of a user Lua coroutine object previously yielded or just created.
+
+Similar to the standard Lua [coroutine.resume](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.resume) API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the `v0.6.0` release.
+
+coroutine.yield
+---------------
+**syntax:** *... = coroutine.yield(co, ...)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Yields the executation of the current user Lua coroutine.
+
+Similar to the standard Lua [coroutine.yield](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.yield) API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the `v0.6.0` release.
+
+coroutine.wrap
+--------------
+**syntax:** *co = coroutine.wrap(f)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Similar to the standard Lua [coroutine.wrap](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.wrap) API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the `v0.6.0` release.
+
+coroutine.running
+-----------------
+**syntax:** *co = coroutine.running()*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Identical to the standard Lua [coroutine.running](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running) API.
+
+This API was first enabled in the `v0.6.0` release.
+
+coroutine.status
+----------------
+**syntax:** *status = coroutine.status(co)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Identical to the standard Lua [coroutine.status](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status) API.
+
+This API was first enabled in the `v0.6.0` release.
+
+ngx.thread.spawn
+----------------
+**syntax:** *co = ngx.thread.spawn(func, arg1, arg2, ...)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Spawns a new user "light thread" with the Lua function `func` as well as those optional arguments `arg1`, `arg2`, and etc. Returns a Lua thread (or Lua coroutine) object represents this "light thread".
+
+"Light threads" are just a special kind of Lua coroutines that are scheduled by the ngx_lua module.
+
+Before `ngx.thread.spawn` returns, the `func` will be called with those optional arguments until it returns, aborts with an error, or gets yielded due to I/O operations via the [Nginx API for Lua](http://wiki.nginx.org/HttpLuaModule#Nginx_API_for_Lua) (like [tcpsock:receive](http://wiki.nginx.org/HttpLuaModule#tcpsock:receive)).
+
+After `ngx.thread.spawn` returns, the newly-created "light thread" will keep running asynchronously usually at various I/O events.
+
+All the Lua code chunks running by [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua), [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua), and [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua) are in a boilerplate "light thread" created automatically by ngx_lua. Such boilerplate "light thread" are also called "entry threads".
+
+By default, the corresponding Nginx handler (e.g., [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) handler) will not terminate until
+1. both the "entry thread" and all the user "light threads" terminates,
+1. a "light thread" (either the "entry thread" or a user "light thread" aborts by calling [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit), [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), [ngx.redirect](http://wiki.nginx.org/HttpLuaModule#ngx.redirect), or [ngx.req.set_uri(uri, true)](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_uri), or
+1. the "entry thread" terminates with a Lua error.
+
+When the user "light thread" terminates with a Lua error, however, it will not abort other running "light threads" like the "entry thread" does.
+
+Due to the limitation in the Nginx subrequest model, it is not allowed to abort a running Nginx subrequest in general. So it is also prohibited to abort a running "light thread" that is pending on one ore more Nginx subrequests. You must call [ngx.thread.wait](http://wiki.nginx.org/HttpLuaModule#ngx.thread.wait) to wait for those "light thread" to terminate before quitting the "world". A notable exception here is that you can abort pending subrequests by calling [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) with and only with the status code `ngx.ERROR` (-1), `408`, `444`, or `499`.
+
+The "light threads" are not scheduled in a pre-emptive way. In other words, no time-slicing is performed automatically. A "light thread" will keep running exclusively on the CPU until
+1. a (nonblocking) I/O operation cannot be completed in a single run,
+1. it calls [coroutine.yield](http://wiki.nginx.org/HttpLuaModule#coroutine.yield) to actively give up execution, or
+1. it is aborted by a Lua error or an invocation of [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit), [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), [ngx.redirect](http://wiki.nginx.org/HttpLuaModule#ngx.redirect), or [ngx.req.set_uri(uri, true)](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_uri).
+
+For the first two cases, the "light thread" will usually be resumed later by the ngx_lua scheduler unless a "stop-the-world" event happens.
+
+User "light threads" can create "light threads" themselves and normal user coroutiens created by [coroutine.create](http://wiki.nginx.org/HttpLuaModule#coroutine.create) can also create "light threads". The coroutine (be it a normal Lua coroutine or a "light thread") that directly spawns the "light thread" is called the "parent coroutine" for the "light thread" newly spawned.
+
+The "parent coroutine" can call [ngx.thread.wait](http://wiki.nginx.org/HttpLuaModule#ngx.thread.wait) to wait on the termination of its child "light thread".
+
+You can call coroutine.status() and coroutine.yield() on the "light thread" coroutines.
+
+The status of the "light thread" coroutine can be "zombie" if
+1. the current "light thread" already terminates (either successfully or with an error),
+1. its parent coroutine is still alive, and
+1. its parent coroutine is not waiting on it with [ngx.thread.wait](http://wiki.nginx.org/HttpLuaModule#ngx.thread.wait).
+
+The following example demonstrates the use of coroutine.yield() in the "light thread" coroutines
+to do manual time-slicing:
+
+
+    local yield = coroutine.yield
+
+    function f()
+        local self = coroutine.running()
+        ngx.say("f 1")
+        yield(self)
+        ngx.say("f 2")
+        yield(self)
+        ngx.say("f 3")
+    end
+
+    local self = coroutine.running()
+    ngx.say("0")
+    yield(self)
+
+    ngx.say("1")
+    ngx.thread.spawn(f)
+
+    ngx.say("2")
+    yield(self)
+
+    ngx.say("3")
+    yield(self)
+
+    ngx.say("4")
+
+
+Then it will generate the output
+
+
+    0
+    1
+    f 1
+    2
+    f 2
+    3
+    f 3
+    4
+
+
+"Light threads" are mostly useful for doing concurrent upstream requests in a single Nginx request handler, kinda like a generalized version of [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi) that can work with all the [Nginx API for Lua](http://wiki.nginx.org/HttpLuaModule#Nginx_API_for_Lua). The following example demonstrates parallel requests to MySQL, Memcached, and upstream HTTP services in a single Lua handler, and outputting the results in the order that they actually return (very much like the Facebook BigPipe model):
+
+
+    -- query mysql, memcached, and a remote http service at the same time,
+    -- output the results in the order that they
+    -- actually return the results.
+
+    local mysql = require "resty.mysql"
+    local memcached = require "resty.memcached"
+
+    local function query_mysql()
+        local db = mysql:new()
+        db:connect{
+                    host = "127.0.0.1",
+                    port = 3306,
+                    database = "test",
+                    user = "monty",
+                    password = "mypass"
+                  }
+        local res, err, errno, sqlstate =
+                db:query("select * from cats order by id asc")
+        db:set_keepalive(0, 100)
+        ngx.say("mysql done: ", cjson.encode(res))
+    end
+
+    local function query_memcached()
+        local memc = memcached:new()
+        memc:connect("127.0.0.1", 11211)
+        local res, err = memc:get("some_key")
+        ngx.say("memcached done: ", res)
+    end
+
+    local function query_http()
+        local res = ngx.location.capture("/my-http-proxy")
+        ngx.say("http done: ", res.body)
+    end
+
+    ngx.thread.spawn(query_mysql)      -- create thread 1
+    ngx.thread.spawn(query_memcached)  -- create thread 2
+    ngx.thread.spawn(query_http)       -- create thread 3 
+
+
+This API was first enabled in the `v0.7.0` release.
+
+ngx.thread.wait
+---------------
+**syntax:** *ok, res1, res2, ... = ngx.thread.wait(thread1, thread2, ...)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Waits on one or more child "light threads" and returns the results of the first "light thread" that terminates (either successfully or with an error).
+
+The arguments `thread1`, `thread2`, and etc are the Lua thread objects returned by earlier calls of [ngx.thread.spawn](http://wiki.nginx.org/HttpLuaModule#ngx.thread.spawn).
+
+The return values have exactly the same meaning as [coroutine.resume](http://wiki.nginx.org/HttpLuaModule#coroutine.resume), that is, the first value returned is a boolean value indicating whether the "light thread" terminates successfully or not, and subsequent values returned are the return values of the user Lua function that was used to spawn the "light thread" (in case of success) or the error object (in case of failure).
+
+Only the direct "parent coroutine" can wait on its child "light thread", otherwise a Lua exception will be raised.
+
+The following example demonstrates the use of `ngx.thread.wait` and [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) to emulate [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi):
+
+
+    local capture = ngx.location.capture
+    local spawn = ngx.thread.spawn
+    local wait = ngx.thread.wait
+    local say = ngx.say
+
+    local function fetch(uri)
+        return capture(uri)
+    end
+
+    local threads = {
+        spawn(fetch, "/foo"),
+        spawn(fetch, "/bar"),
+        spawn(fetch, "/baz")
+    }
+
+    for i = 1, #threads do
+        local ok, res = wait(threads[i])
+        if not ok then
+            say(i, ": failed to run: ", res)
+        else
+            say(i, ": status: ", res.status)
+            say(i, ": body: ", res.body)
+        end
+    end
+
+
+Here it essentially implements the "wait all" model.
+
+And below is an example demonstrating the "wait any" model:
+
+
+    function f()
+        ngx.sleep(0.2)
+        ngx.say("f: hello")
+        return "f done"
+    end
+
+    function g()
+        ngx.sleep(0.1)
+        ngx.say("g: hello")
+        return "g done"
+    end
+
+    local tf, err = ngx.thread.spawn(f)
+    if not tf then
+        ngx.say("failed to spawn thread f: ", err)
+        return
+    end
+
+    ngx.say("f thread created: ", coroutine.status(tf))
+
+    local tg, err = ngx.thread.spawn(g)
+    if not tg then
+        ngx.say("failed to spawn thread g: ", err)
+        return
+    end
+
+    ngx.say("g thread created: ", coroutine.status(tg))
+
+    ok, res = ngx.thread.wait(tf, tg)
+    if not ok then
+        ngx.say("failed to wait: ", res)
+        return
+    end
+
+    ngx.say("res: ", res)
+
+    -- stop the "world", aborting other running threads
+    ngx.exit(ngx.OK)
+
+
+And it will generate the following output:
+
+
+    f thread created: running
+    g thread created: running
+    g: hello
+    res: g done
+
+
+This API was first enabled in the `v0.7.0` release.
+
+ngx.on_abort
+------------
+**syntax:** *ok, err = ngx.on_abort(callback)*
+
+**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+
+Registers a user Lua function as the callback which gets called automatically when the client closes the (downstream) connection prematurely.
+
+Returns `1` if the callback is registered successfully or returns `nil` and a string describing the error otherwise.
+
+All the [Nginx API for Lua](http://wiki.nginx.org/HttpLuaModule#Nginx_API_for_Lua) can be used in the callback function because the function is run in a special "light thread", just as those "light threads" created by [ngx.thread.spawn](http://wiki.nginx.org/HttpLuaModule#ngx.thread.spawn).
+
+The callback function can decide what to do with the client abortion event all by itself. For example, it can simply ignore the event by doing nothing and the current Lua request handler will continue executing without interruptions. And the callback function can also decide to terminate everything by calling [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit), for example,
+
+
+    local function my_cleanup()
+        -- custom cleanup work goes here, like cancelling a pending DB transaction
+
+        -- now abort all the "light threads" running in the current request handler
+        ngx.exit(499)
+    end
+
+    local ok, err = ngx.on_abort(my_cleanup)
+    if not ok then
+        ngx.log(ngx.ERR, "failed to register the on_abort callback: ", err)
+        ngx.exit(500)
+    end
+
+
+When [lua_check_client_abort](http://wiki.nginx.org/HttpLuaModule#lua_check_client_abort) is set to `off` (which is the default), then this function call will always return the error message "lua_check_client_abort is off".
+
+According to the current implementation, this function can only be called once in a single request handler; subsequent calls will return the error message "duplicate call".
+
+This API was first introduced in the `v0.7.4` release.
+
+See also [lua_check_client_abort](http://wiki.nginx.org/HttpLuaModule#lua_check_client_abort).
+
 ndk.set_var.DIRECTIVE
 ---------------------
 **syntax:** *res = ndk.set_var.DIRECTIVE_NAME*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua**
 
 This mechanism allows calling other nginx C modules' directives that are implemented by [Nginx Devel Kit](https://github.com/simpl/ngx_devel_kit) (NDK)'s set_var submodule's `ndk_set_var_value`.
 
@@ -3510,37 +4579,71 @@ Similarly, the following directives provided by [HttpEncryptedSessionModule](htt
 
 This feature requires the [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit) module.
 
+Lua/LuaJIT bytecode support
+===========================
+
+As from the `v0.5.0rc32` release, all `*_by_lua_file` configure directives (such as [content_by_lua_file](http://wiki.nginx.org/HttpLuaModule#content_by_lua_file)) support loading Lua 5.1 and LuaJIT 2.0 raw bytecode files directly.
+
+Please note that the bytecode format used by LuaJIT 2.0 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+
+
+    /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.luac
+
+
+The `-bg` option can be used to include debug information in the LuaJIT bytecode file:
+
+
+    /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.luac
+
+
+Please refer to the official LuaJIT documentation on the `-b` option for more details:
+
+<http://luajit.org/running.html#opt_b>
+
+Similarly, if using the standard Lua 5.1 interpreter with ngx_lua, Lua compatible bytecode files must be generated using the `luac` commandline utility as shown:
+
+
+    luac -o /path/to/output_file.luac /path/to/input_file.lua
+
+
+Unlike as with LuaJIT, debug information is included in standard Lua 5.1 bytecode files by default. This can be striped out by specifying the `-s` option as shown:
+
+
+    luac -s -o /path/to/output_file.luac /path/to/input_file.lua
+
+
+Attempts to load standard Lua 5.1 bytecode files into ngx_lua instances linked to LuaJIT 2.0 or vice versa, will result in an error message, such as that below, being logged into the Nginx `error.log` file:
+
+
+    [error] 13909#0: *1 failed to load Lua inlined code: bad byte-code header in /path/to/test_file.luac
+
+
+Loading bytecode files via the Lua primitives like `require` and `dofile` should always work as expected.
+
 HTTP 1.0 support
 ================
 
-The HTTP 1.0 protocol does not support chunked outputs and always requires an
-explicit `Content-Length` header when the response body is non-empty in order to support the HTTP 1.0 keep-alive (as required by the ApacheBench (ab) tool). So when
-an HTTP 1.0 request is present and the [lua_http10_buffering](http://wiki.nginx.org/HttpLuaModule#lua_http10_buffering) directive is turned `on`, this module will automatically buffer all the
-outputs of user calls of [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) and [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) and
-postpone sending response headers until it sees all the outputs in the response
-body, and at that time ngx_lua can calculate the total length of the body and
-construct a proper `Content-Length` header for the HTTP 1.0 client.
+The HTTP 1.0 protocol does not support chunked output and requires an explicit `Content-Length` header when the response body is not empty in order to support the HTTP 1.0 keep-alive.
+So when a HTTP 1.0 request is made and the [lua_http10_buffering](http://wiki.nginx.org/HttpLuaModule#lua_http10_buffering) directive is turned `on`, ngx_lua will buffer the
+output of [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) and [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) calls and also postpone sending response headers until all the response body output is received.
+At that time ngx_lua can calculate the total length of the body and construct a proper `Content-Length` header to return to the HTTP 1.0 client.
+If the `Content-Length` response header is set in the running Lua code, however, this buffering will be disabled even if the [lua_http10_buffering](http://wiki.nginx.org/HttpLuaModule#lua_http10_buffering) directive is turned `on`.
 
-If the user Lua code sets the `Content-Length` response header itself, then the automatic buffering will be disabled even if the [lua_http10_buffering](http://wiki.nginx.org/HttpLuaModule#lua_http10_buffering) directive is turned `on`.
+For large streaming output responses, it is important to disable the [lua_http10_buffering](http://wiki.nginx.org/HttpLuaModule#lua_http10_buffering) directive to minimise memory usage.
 
-For big responses' streaming outputs, it's important to disable the [lua_http10_buffering](http://wiki.nginx.org/HttpLuaModule#lua_http10_buffering) directive, otherwise the memory usage will grow very quickly.
-
-Note that, common HTTP benchmark tools like `ab` and `http_load` always issue
-HTTP 1.0 requests by default. To force `curl` to send HTTP 1.0 requests, use
-the `-0` option.
+Note that common HTTP benchmark tools such as `ab` and `http_load` issue HTTP 1.0 requests by default.
+To force `curl` to send HTTP 1.0 requests, use the `-0` option.
 
 Data Sharing within an Nginx Worker
 ===================================
 
-**NOTE: This mechanism behaves differently when code cache is turned off and should be considered a DIRTY TRICK. Note that backward compatibility is NOT guaranteed and that there may be other undesirable consequences. A new data sharing mechanism will be designed later.**
-
 To globally share data among all the requests handled by the same nginx worker process, encapsulate the shared data into a Lua module, use the Lua `require` builtin to import the module, and then manipulate the shared data in Lua. This works because required Lua modules are loaded only once and all coroutines will share the same copy of the module. Note however that Lua global variables WILL NOT persist between requests because of the one-coroutine-per-request isolation design.
 
 Here is a complete small example:
 
 
     -- mydata.lua
-    module("mydata", package.seeall)
+    module(...)
  
     local data = {
         dog = 3,
@@ -3557,8 +4660,8 @@ and then accessing it from `nginx.conf`:
 
 
     location /lua {
-        content_lua_by_lua '
-            local mydata = require("mydata")
+        content_by_lua '
+            local mydata = require "mydata"
             ngx.say(mydata.get_age("dog"))
         ';
     }
@@ -3569,53 +4672,64 @@ and all subsequent requests to the same nginx worker process will use the reload
 module as well as the same copy of the data in it, until a `HUP` signal is sent to the Nginx master process to force a reload.
 This data sharing technique is essential for high performance Lua applications based on this module.
 
-Note that this data sharing is on a *per-worker* basis and not on a ''per-server' basis'. That is, when there are multiple nginx worker processes under an Nginx master, data sharing cannot cross the process boundary between these workers. 
+Note that this data sharing is on a *per-worker* basis and not on a *per-server* basis. That is, when there are multiple nginx worker processes under an Nginx master, data sharing cannot cross the process boundary between these workers.
 
-If server wide data sharing is required:
-1. Use the [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT) API provied by this module.
-1. Use only a single nginx worker and a single server. This is however not recommended when there is a multi core CPU or multiple CPUs in a single machine.
-1. Use data storage mechanisms such as `memcached`, `redis`, `MySQL` or `PostgreSQL`. [The ngx_openresty bundle](http://openresty.org) associated with this module comes with a set of companion Nginx modules that provide interfaces with these data storage mechanisms.  See the [HttpMemcModule](http://wiki.nginx.org/HttpMemcModule), [HttpRedis2Module](http://wiki.nginx.org/HttpRedis2Module), [HttpDrizzleModule](http://wiki.nginx.org/HttpDrizzleModule) and [HttpPostgresModule](http://github.com/FRiCKLE/ngx_postgres/) modules for details
+If server-wide data sharing is required, then use one or more of the following approaches:
+1. Use the [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT) API provided by this module.
+1. Use only a single nginx worker and a single server (this is however not recommended when there is a multi core CPU or multiple CPUs in a single machine).
+1. Use data storage mechanisms such as `memcached`, `redis`, `MySQL` or `PostgreSQL`. [The ngx_openresty bundle](http://openresty.org) associated with this module comes with a set of companion Nginx modules and Lua libraries that provide interfaces with these data storage mechanisms.
 
 Known Issues
 ============
 
+TCP socket connect operation issues
+-----------------------------------
+The [tcpsock:connect](http://wiki.nginx.org/HttpLuaModule#tcpsock:connect) method may indicate `success` despite connection failures such as with `Connection Refused` errors. 
+
+However, later attempts to manipulate the cosocket object will fail and return the actual error status message generated by the failed connect operation. 
+
+This issue is due to limitations in the Nginx event model and only appears to affect Mac OS X.
+
 Lua Coroutine Yielding/Resuming
 -------------------------------
 * As the module's predefined Nginx I/O API uses the coroutine yielding/resuming mechanism, user code should not call any Lua modules that use the Lua coroutine mechanism in order to prevent conflicts with the module's predefined Nginx API methods such as [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) (Actually, coroutine modules have been masked off in [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua) directives and others). This limitation is significant and work is ongoing on an alternative coroutine implementation that can fit into the Nginx event model to address this. When this is done, it will be possible to use the Lua coroutine mechanism freely as it is in standard Lua implementations.
-* Lua's `dofile` builtin is implemented as a C function in both Lua 5.1 and LuaJIT 2.0 and when [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) is called, [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) or [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) or similar in the file to be loaded by `dofile`, a coroutine yield across the C function boundary will be initiated. This however is not allowed within ngx_lua and will usually result in error messages like `lua handler aborted: runtime error: attempt to yield across C-call boundary`. To avoid this, define a real Lua module and use the Lua `require` builtin instead.
-* Because the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture), [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi), [ngx.redirect](http://wiki.nginx.org/HttpLuaModule#ngx.redirect), [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), and [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) cannot be used within the context of a Lua [pcall()](http://www.lua.org/manual/5.1/manual.html#pdf-pcall) or [xpcall()](http://www.lua.org/manual/5.1/manual.html#pdf-xpcall) when the standard Lua 5.1 interpreter is used and the `attempt to yield across metamethod/C-call boundary` error will be produced. Please use LuaJIT 2.0, which supports a fully resumable VM, to avoid this.
+* Lua's `dofile` builtin is implemented as a C function in both Lua 5.1 and LuaJIT 2.0 and when [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) is called, [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) or [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body) or similar in the file to be loaded by `dofile`, a coroutine yield across the C function boundary will be initiated. This however is not normally allowed within ngx_lua and will usually result in error messages like `lua handler aborted: runtime error: attempt to yield across C-call boundary`. To avoid this, define a real Lua module and use the Lua `require` builtin instead.
+* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture), [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi), [ngx.redirect](http://wiki.nginx.org/HttpLuaModule#ngx.redirect), [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), and [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit) cannot be used within the context of a Lua [pcall()](http://www.lua.org/manual/5.1/manual.html#pdf-pcall) or [xpcall()](http://www.lua.org/manual/5.1/manual.html#pdf-xpcall) when the standard Lua 5.1 interpreter is used and the `attempt to yield across metamethod/C-call boundary` error will be produced. Please use LuaJIT 2.0, which supports a fully resumable VM, to avoid this.
 
 Lua Variable Scope
 ------------------
 Care should be taken when importing modules and this form should be used:
 
 
-        local xxx = require('xxx')
+    local xxx = require('xxx')
 
 
 	instead of the old deprecated form:
 
 
-        require('xxx')
+    require('xxx')
 
 
 	If the old form is required, force reload the module for every request by using the `package.loaded.<module>` command:
 
 
-        package.loaded.xxx = nil
-        require('xxx')
+    package.loaded.xxx = nil
+    require('xxx')
 
 
-It is recommended to always place the following piece of code at the end of Lua modules that use the [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) or [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi) directives to prevent casual use of module-level global variables that are shared among *all* requests:
+It is recommended to always place the following piece of code at the end of Lua modules that use the I/O operations to prevent casual use of module-level global variables that are shared among *all* requests:
 
 
-    getmetatable(foo.bar).__newindex = function (table, key, val)
-        error('Attempt to write to undeclared variable "' .. key .. '": '
-                .. debug.traceback())
-    end
+    local class_mt = {
+        -- to prevent use of casual module global variables
+        __newindex = function (table, key, val)
+            error('attempt to write to undeclared variable "' .. key .. '"')
+        end
+    }
+    setmetatable(_M, class_mt)
 
 
-Assuming the current Lua module is named `foo.bar`, this will guarantee that local variables in module `foo.bar` functions have been declared as "local". It prevents undesirable race conditions while accessing such variables. See [Data Sharing within an Nginx Worker](http://wiki.nginx.org/HttpLuaModule#Data_Sharing_within_an_Nginx_Worker) for the reasons behind this.
+This will guarantee that local variables in the Lua module functions are all declared with the `local` keyword, otherwise a runtime exception will be thrown. It prevents undesirable race conditions while accessing such variables. See [Data Sharing within an Nginx Worker](http://wiki.nginx.org/HttpLuaModule#Data_Sharing_within_an_Nginx_Worker) for the reasons behind this.
 
 Locations Configured by Subrequest Directives of Other Modules
 --------------------------------------------------------------
@@ -3624,7 +4738,7 @@ The [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capt
 
     location /foo {
         content_by_lua '
-            res = ngx.location.capature("/bar")
+            res = ngx.location.capture("/bar")
         ';
     }
     location /bar {
@@ -3690,13 +4804,13 @@ Alternatively, the regex pattern can be presented as a long-bracketed Lua string
 Here, `[[\\d+]]` is stripped down to `[[\d+]]` by the Nginx config file parser and this is processed correctly.
 
 Note that a longer from of the long bracket, `[=[...]=]`, may be required if the regex pattern contains `[...]` sequences. 
-The `[=[...]=]` form may be used as the default form if desired and it may help with readability if a space is inserted between the long brackets and the regex patterns.
+The `[=[...]=]` form may be used as the default form if desired.
 
 
     # nginx.conf
     location /test {
         content_by_lua '
-            local regex = [=[ [0-9]+ ]=]
+            local regex = [=[[0-9]+]=]
             local m = ngx.re.match("hello, 1234", regex)
             if m then ngx.say(m[0]) else ngx.say("not matched!") end
         ';
@@ -3742,20 +4856,20 @@ The possibilities are unlimited as the module allows bringing together various e
 
 Other scripting language implementations typically struggle to match this performance level.
 
-The Lua state (Lua VM instance) is shared across all the requests handled by a single nginx worker process to miminize memory use.
+The Lua state (Lua VM instance) is shared across all the requests handled by a single nginx worker process to minimize memory use.
 
-On a ThinkPad T400 2.80 GHz laptop, the HelloWorld example readily achieves 28k req/sec using `http_load -p 10`. By contrast, Nginx + php-fpm 5.2.8 + Unix Domain Socket yields 6k req/sec and [Node.js](http://nodejs.org/) v0.6.1 yields 10.2k req/sec for their HelloWorld equivalents.
-
-This module performs best when built with [LuaJIT 2.0](http://luajit.org/luajit.html).
+On a ThinkPad T400 2.80 GHz laptop, the Hello World example readily achieves 28k req/sec using `http_load -p 10`. By contrast, Nginx + php-fpm 5.2.8 + Unix Domain Socket yields 6k req/sec and [Node.js](http://nodejs.org/) v0.6.1 yields 10.2k req/sec for their Hello World equivalents.
 
 Nginx Compatibility
 ===================
 The module is compatible with the following versions of Nginx:
 
-*   1.1.x (last tested: 1.1.5)
-*   1.0.x (last tested: 1.0.15)
-*   0.9.x (last tested: 0.9.4)
-*   0.8.x >= 0.8.54 (last tested: 0.8.54)
+* 1.3.x (last tested: 1.3.7)
+* 1.2.x (last tested: 1.2.4)
+* 1.1.x (last tested: 1.1.5)
+* 1.0.x (last tested: 1.0.15)
+* 0.9.x (last tested: 0.9.4)
+* 0.8.x >= 0.8.54 (last tested: 0.8.54)
 
 Code Repository
 ===============
@@ -3765,29 +4879,29 @@ The code repository of this project is hosted on github at [chaoslawful/lua-ngin
 Installation
 ============
 
-The [ngx_openresty bundle](http://openresty.org) can be used to install Nginx, `ngx_lua`, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0, as well as a package of powerful companion Nginx modules. The basic installation step is a simple `./configure --with-luajit && make && make install`.
+The [ngx_openresty bundle](http://openresty.org) can be used to install Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0, as well as a package of powerful companion Nginx modules. The basic installation step is a simple `./configure --with-luajit && make && make install`.
 
-Alternatively, `ngx_lua` can be manually compiled into Nginx:
+Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. Install LuaJIT 2.0 (Recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). Lua can be obtained free from the [the LuaJIT download page](http://luajit.org/download.html) or [the standard Lua homepage](http://www.lua.org/).  Some distribution package managers also distribute Lua and LuaJIT.
+1. Install LuaJIT 2.0 (Recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuajIT can be downloaded from the [the LuaJIT project website](http://luajit.org/download.html) and Lua 5.1, from the [Lua project website](http://www.lua.org/).  Some distribution package managers also distribute LuajIT and/or Lua.
 1. Download the latest version of the ngx_devel_kit (NDK) module [HERE](http://github.com/simpl/ngx_devel_kit/tags).
-1. Download the latest version of this module [HERE](http://github.com/chaoslawful/lua-nginx-module/tags).
+1. Download the latest version of ngx_lua [HERE](http://github.com/chaoslawful/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](http://wiki.nginx.org/HttpLuaModule#Nginx_Compatibility))
 
 Build the source with this module:
 
 
-    wget 'http://nginx.org/download/nginx-1.0.15.tar.gz'
-    tar -xzvf nginx-1.0.15.tar.gz
-    cd nginx-1.0.15/
+    wget 'http://nginx.org/download/nginx-1.2.4.tar.gz'
+    tar -xzvf nginx-1.2.4.tar.gz
+    cd nginx-1.2.4/
+
+    # tell nginx's build system where to find LuaJIT:
+    export LUAJIT_LIB=/path/to/luajit/lib
+    export LUAJIT_INC=/path/to/luajit/include/luajit-2.0
  
-    # tell nginx's build system where to find lua:
-    export LUA_LIB=/path/to/lua/lib
-    export LUA_INC=/path/to/lua/include
- 
-    # or tell where to find LuaJIT when if using JIT instead
-    # export LUAJIT_LIB=/path/to/luajit/lib
-    # export LUAJIT_INC=/path/to/luajit/include/luajit-2.0
+    # or tell where to find Lua if using Lua instead:
+    #export LUA_LIB=/path/to/lua/lib
+    #export LUA_INC=/path/to/lua/include
  
     # Here we assume Nginx is to be installed under /opt/nginx/.
     ./configure --prefix=/opt/nginx \
@@ -3798,131 +4912,75 @@ Build the source with this module:
     make install
 
 
+Installation on Ubuntu 11.10
+----------------------------
+
+Note that it is recommended to use LuaJIT 2.0 instead of the standard Lua 5.1 interpreter where possible. 
+
+If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
+
+
+    apt-get install -y lua5.1 liblua5.1-0 liblua5.1-0-dev
+
+
+Everything should be installed correctly, except for one small tweak. 
+
+Library name `liblua.so` has been changed in liblua5.1 package, it only comes with `liblua5.1.so`, which needs to be symlinked to `/usr/lib` so it could be found during the configuration process.
+
+
+    ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
+
+
+Community
+=========
+
+English Mailing List
+--------------------
+
+The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
+
+Chinese Mailing List
+--------------------
+
+The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
+
 Bugs and Patches
 ================
 
-Please report bugs or submit patches by:
+Please submit bug reports, wishlists, or patches by
 
-1. Creating a ticket on the [GitHub Issue Tracker](http://github.com/chaoslawful/lua-nginx-module/issues) (Recommended)
-1. Posting to the [Nginx Mailing List](http://mailman.nginx.org/mailman/listinfo/nginx) and also adding `[ngx_lua]` to the mail subject.
+1. creating a ticket on the [GitHub Issue Tracker](http://github.com/chaoslawful/lua-nginx-module/issues),
+1. or posting to the [OpenResty community](http://wiki.nginx.org/HttpLuaModule#Community).
 
 TODO
 ====
 
 Short Term
 ----------
-* implement the `ngx.sleep(time)` Lua API. (For now, use [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) with [HttpEchoModule](http://wiki.nginx.org/HttpEchoModule)'s [echo_sleep](http://wiki.nginx.org/HttpEchoModule#echo_sleep) config directive instead.)
-* implement the `ngx.worker.get_pid()` Lua API. (For now, use `ngx.var.pid` directly.)
-* implement [LuaSocket UDP API](http://w3.impa.br/~diego/software/luasocket/udp.html) in our cosocket API.
+* review and apply Brian Akin's patch for the new directive `lua_socket_log_errors`.
+* review and apply Brian Akin's patch for the new `shdict:flush_expired()` API.
 * implement the SSL cosocket API.
-* implement the `ngx.re.split` method.
+* review and apply Jader H. Silva's patch for `ngx.re.split()`.
+* review and apply vadim-pavlov's patch for [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture)'s `extra_headers` option
 * use `ngx_hash_t` to optimize the built-in header look-up process for [ngx.req.set_header](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_header), [ngx.header.HEADER](http://wiki.nginx.org/HttpLuaModule#ngx.header.HEADER), and etc.
 * add configure options for different strategies of handling the cosocket connection exceeding in the pools.
-* add directives to run Lua codes when nginx stops/reloads.
+* add directives to run Lua codes when nginx stops.
 * add APIs to access cookies as key/value pairs.
 * add `ignore_resp_headers`, `ignore_resp_body`, and `ignore_resp` options to [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi) methods, to allow micro performance tuning on the user side.
+* implement new directive `lua_ignore_client_abort`.
 
 Longer Term
 -----------
-* add the `lua_require` directive to load module into main thread's globals.
-* add Lua code automatic time slicing support by yielding and resuming the Lua VM actively via Lua's debug hooks.
-* make [set_by_lua](http://wiki.nginx.org/HttpLuaModule#set_by_lua), [header_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua), and their variants use the same mechanism as [content_by_lua](http://wiki.nginx.org/HttpLuaModule#content_by_lua), [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua), [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua), and their variants.
-* add coroutine API back to the Lua user land.
+* add lightweight thread API (i.e., the `ngx.thread` API) as demonstrated in [this sample code](http://agentzh.org/misc/nginx/lua-thread2.lua).
+* add automatic Lua code time slicing support by yielding and resuming the Lua VM actively via Lua's debug hooks.
 * add `stat` mode similar to [mod_lua](http://httpd.apache.org/docs/2.3/mod/mod_lua.html).
 
 Changes
 =======
 
-v0.4.1
-------
+The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
 
-1 February, 2012
-
-* bugfix: [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit), [ngx.redirect](http://wiki.nginx.org/HttpLuaModule#ngx.redirect), [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec), and [ngx.req.set_uri(uri, true)](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_uri) could return (they should never return as per the documentation). this bug had appeared in ngx_lua v0.3.1rc4 and ngx_openresty 1.0.6.13. thanks [@cyberty](http://weibo.com/cyberty) for reporting it.
-* bugfix: `ngx_http_lua_header_filter_init` was called with an argument which actually accepts none. this could cause compilation errors at least with gcc 4.3.4 as reported in [github issue #80](http://github.com/chaoslawful/lua-nginx-module/issues/80). thanks bigplum (Simon).
-* bugfix: fixed all the warnings from the clang static analyzer.
-* feature: allow use of the `DDEBUG` macro from the outside (via the `-D DDEBUG=1` C compiler opton).
-
-v0.4.0
-------
-
-11 January, 2012
-
-* bugfix: fixed a bug when the both the main request and the subrequest are POST requests with a body: we should not forward the main request's `Content-Length` headers to the user subrequests. thanks 朱峰.
-* feature: implemented the API for reading response headers from within Lua: `value = ngx.header.HEADER`, see [ngx.header.HEADER](http://wiki.nginx.org/HttpLuaModule#ngx.header.HEADER).
-* bugfix: fixed a bug when setting a multi-value response header to a single value (via writing to [ngx.header.HEADER](http://wiki.nginx.org/HttpLuaModule#ngx.header.HEADER)): the single value will be repeated on each old value.
-* bugfix: fixed an issue in [ngx.redirect](http://wiki.nginx.org/HttpLuaModule#ngx.redirect), [ngx.exit](http://wiki.nginx.org/HttpLuaModule#ngx.exit), and [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec): these function calls would be intercepted by Lua `pcall`/`xpcall` because they used Lua exceptions; now they use Lua yield just as [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture). thanks @hugozhu for reporting this.
-* feature: now we also return the `Last-Modified` header (if any) for the subrequest response object. thanks @cyberty and sexybabes.
-* feature: now [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec) supports Lua table as the second args argument value. thanks sexybabes.
-* feature: implemented the [ngx.headers_sent](http://wiki.nginx.org/HttpLuaModule#ngx.headers_sent) API to check if response headers are sent (by ngx_lua). thanks @hugozhu.
-* feature: exposes the CRC-32 API of the Nginx core to the Lua land, in the form of the [ngx.crc32_short](http://wiki.nginx.org/HttpLuaModule#ngx.crc32_short) and [ngx.crc32_long](http://wiki.nginx.org/HttpLuaModule#ngx.crc32_long) methods. thanks @Lance.
-* feature: now for HTTP 1.0 requests, we disable the automatic full buffering mode if the user sets the `Content-Length` response header before sending out the headers. this allows streaming output for HTTP 1.0 requests if the content length can be calculated beforehand. thanks 李子义.
-* bugfix: now we properly support setting the `Cache-Control` response header via the [ngx.header.HEADER](http://wiki.nginx.org/HttpLuaModule#ngx.header.HEADER) interface.
-* bugfix: no longer set header hash to `1`. use the `ngx_hash_key_lc` instead.
-* bugfix: calling [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec) to jump to a named location did not clear the context object of LuaNginxModule properly and might cause evil problems. thanks Nginx User.
-* bugfix: now we explicitly clear all the modules' contexts before dump to named location with [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec).
-* feature: implemented [ngx.req.set_uri](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_uri) and [ngx.req.set_uri_args](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_uri_args) to emulate [HttpRewriteModule](http://wiki.nginx.org/HttpRewriteModule)'s [rewrite](http://wiki.nginx.org/HttpRewriteModule#rewrite) directive. thanks Vladimir Protasov (utros) and Nginx User.
-* bugfix: now we skip rewrite phase Lua handlers altogether if [HttpRewriteModule](http://wiki.nginx.org/HttpRewriteModule)'s [rewrite](http://wiki.nginx.org/HttpRewriteModule#rewrite) directive issue a location re-lookup by changing URIs (but not including `rewrite ... break`). thanks Nginx User.
-* feature: added constant `ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)`. thanks Nginx User.
-* feature: added new Lua functions [ngx.req.read_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.read_body), [ngx.req.discard_body](http://wiki.nginx.org/HttpLuaModule#ngx.req.discard_body), [ngx.req.get_body_data](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_body_data), and [ngx.req.get_body_file](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_body_file). thanks Tzury Bar Yochay for funding the development work.
-* bugfix: fixed hanging issues when using [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec) within [rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) and [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua). thanks Nginx User for reporting it.
-* feature: added new Lua API [ngx.req.set_body_file](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_body_file). thanks Tzury Bar Yochay for funding the development work.
-* feature: added new Lua API [ngx.req.set_body_data](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_body_data). thanks Tzury Bar Yochay for funding the development work.
-* bugfix: [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) should not skip requests with methods other than `POST` and `PUT`. thanks Nginx User.
-* bugfix: no longer free request body buffers that are not allocated by ourselves.
-* bugfix: now we allow setting [ngx.var.VARIABLE](http://wiki.nginx.org/HttpLuaModule#ngx.var.VARIABLE) to nil.
-* feature: added new directive [lua_shared_dict](http://wiki.nginx.org/HttpLuaModule#lua_shared_dict).
-* feature: added Lua API for the shm-based dictionary, see [ngx.shared.DICT](http://wiki.nginx.org/HttpLuaModule#ngx.shared.DICT).
-* bugfix: fixed spots of -Werror=unused-but-set-variable warning issued by gcc 4.6.0.
-* bugfix: [ndk.set_var.DIRECTIVE](http://wiki.nginx.org/HttpLuaModule#ndk.set_var.DIRECTIVE) had a memory issue and might pass empty argument values to the directive being called. thanks dannynoonan.
-* feature: added the `ctx` option to [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture): you can now specify a custom Lua table to pass to the subrequest as its [ngx.ctx](http://wiki.nginx.org/HttpLuaModule#ngx.ctx). thanks @hugozhu.
-* feature: added the [ngx.encode_args](http://wiki.nginx.org/HttpLuaModule#ngx.encode_args) method to encode a Lua code to a URI query string. thanks 郭颖 (0597虾).
-* feature: [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.exec](http://wiki.nginx.org/HttpLuaModule#ngx.exec) now supports the same Lua args table format as in ngx.encode_args. thanks 郭颖 (0597虾).
-* bugfix: `Cache-Control` header modification might introduce empty value headers when using with the standard HttpHeadersModule.
-* feature: added [ngx.hmac_sha1](http://wiki.nginx.org/HttpLuaModule#ngx.hmac_sha1). thanks drdrxp.
-* docs: documented the long-existent [ngx.md5](http://wiki.nginx.org/HttpLuaModule#ngx.md5) and [ngx.md5_bin](http://wiki.nginx.org/HttpLuaModule#ngx.md5_bin) APIs.
-* docs: massive documentation improvements. thanks Nginx User.
-* feature: added new regex options `j` and `d` to [ngx.re.match](http://wiki.nginx.org/HttpLuaModule#ngx.re.match), [ngx.re.gmatch](http://wiki.nginx.org/HttpLuaModule#ngx.re.gmatch), [ngx.re.sub](http://wiki.nginx.org/HttpLuaModule#ngx.re.sub), and [ngx.re.gsub](http://wiki.nginx.org/HttpLuaModule#ngx.re.gsub) so as to enable the PCRE JIT mode and DFA mode, respectively. thanks @姜大炮 for providing the patch.
-* feature: added options `copy_all_vars` and `vars` to [ngx.location.capture](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture) and [ngx.location.capture_multi](http://wiki.nginx.org/HttpLuaModule#ngx.location.capture_multi). thanks Marcus Clyne for the patch.
-* feature: added new Lua API [ngx.now](http://wiki.nginx.org/HttpLuaModule#ngx.now) to return the current time (including the milliseconds part as the decimal part). thanks 林青.
-* feature: added new Lua API [ngx.update_time](http://wiki.nginx.org/HttpLuaModule#ngx.update_time) to forcibly updating Nginx's time cache.
-* feature: added `wait` boolean argument to [ngx.flush](http://wiki.nginx.org/HttpLuaModule#ngx.flush) to support synchronous flushing: `ngx.flush(true)` will not return until all the data has been flushed into the system send buffer or the send timeout has expired.
-* bugfix: now we check timed out downstream connections in our write event handler.
-* feature: added constant `ngx.HTTP_GATEWAY_TIMEOUT (504)` per Fry-kun in [github issue #73](https://github.com/chaoslawful/lua-nginx-module/issues/73).
-* bugfix: [ngx.var.VARIABLE](http://wiki.nginx.org/HttpLuaModule#ngx.var.VARIABLE) did not evaluate to `nil` when the Nginx variable's `valid` flag is `0`.
-* bugfix: there were various places where we did not check the pointer returned by the memory allocator.
-* bugfix: [ngx.req.set_header](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_header) and [ngx.req.clear_header](http://wiki.nginx.org/HttpLuaModule#ngx.req.clear_header) did not handle the `Accept-Encoding` request headers properly. thanks 天街夜色.
-* bugfix: [ngx.req.set_header](http://wiki.nginx.org/HttpLuaModule#ngx.req.set_header) might cause invalid memory reads because Nginx request header values must be `NULL` terminated. thanks Maxim Dounin.
-* bugfix: removing builtin headers via [ngx.req.clear_header](http://wiki.nginx.org/HttpLuaModule#ngx.req.clear_header) and its equivalent in huge request headers with 20+ entries could result in data loss. thanks Chris Dumoulin.
-* bugfix: [ngx.req.get_uri_args](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_uri_args) and [ngx.req.get_post_args](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_post_args) now only parse up to `100` arguments by default. but one can specify the optional argument to these two methods to specify a custom maximum number of args. thanks Tzury Bar Yochay for reporting this.
-* bugfix: [ngx.req.get_headers](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_headers) now only parse up to `100` request headers by default. but one can specify the optional argument to this method to specify a custom maximum number of headers.
-
-v0.3.0
-------
-
-September 02, 2011
-
-**New features**
-
-* added the [header_filter_by_lua](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua) and [header_filter_by_lua_file](http://wiki.nginx.org/HttpLuaModule#header_filter_by_lua_file) directives. thanks Liseen Wan (万珣新).
-* implemented the PCRE regex API for Lua: [ngx.re.match](http://wiki.nginx.org/HttpLuaModule#ngx.re.match), [ngx.re.gmatch](http://wiki.nginx.org/HttpLuaModule#ngx.re.gmatch), [ngx.re.sub](http://wiki.nginx.org/HttpLuaModule#ngx.re.sub), and [ngx.re.gsub](http://wiki.nginx.org/HttpLuaModule#ngx.re.gsub).
-* now we add the `ngx` and `ndk` table into `package.loaded` such that the user can write `local ngx = require 'ngx'` and `local ndk = require 'ndk'`. thanks @Lance.
-* added new directive [lua_regex_cache_max_entries](http://wiki.nginx.org/HttpLuaModule#lua_regex_cache_max_entries) to control the upper limit of the worker-process-level compiled-regex cache enabled by the `o` regex option.
-* implemented the special [ngx.ctx](http://wiki.nginx.org/HttpLuaModule#ngx.ctx) Lua table for user programmers to store per-request Lua context data for their applications. thanks 欧远宁 for suggesting this feature.
-* now [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print) and [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say) allow (nested) array-like table arguments. the array elements in them will be sent piece by piece. this will avoid string concatenation for templating engines like [ltp](http://www.savarese.com/software/ltp/).
-* implemented the [ngx.req.get_post_args](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_post_args) method for fetching url-encoded POST query arguments from within Lua.
-* implemented the [ngx.req.get_uri_args](http://wiki.nginx.org/HttpLuaModule#ngx.req.get_uri_args) method to fetch parsed URL query arguments from within Lua. thanks Bertrand Mansion (golgote).
-* added new function [ngx.parse_http_time](http://wiki.nginx.org/HttpLuaModule#ngx.parse_http_time), thanks James Hurst.
-* now we allow Lua boolean and `nil` values in arguments to [ngx.say](http://wiki.nginx.org/HttpLuaModule#ngx.say), [ngx.print](http://wiki.nginx.org/HttpLuaModule#ngx.print), [ngx.log](http://wiki.nginx.org/HttpLuaModule#ngx.log) and [print](http://wiki.nginx.org/HttpLuaModule#print).
-* added support for user C macros `LUA_DEFAULT_PATH` and `LUA_DEFAULT_CPATH`. for now we can only define them in `ngx_lua`'s `config` file because nginx `configure`'s `--with-cc-opt` option hates values with double-quotes in them. sigh. This feature is used by [The ngx_openresty bundle](http://openresty.org) to bundle third party Lua libraries.
-
-**Bug fixes**
-
-* worked-around the "stack overflow" issue while using `luarocks.loader` and disabling [lua_code_cache](http://wiki.nginx.org/HttpLuaModule#lua_code_cache), as described as github issue #27. thanks Patrick Crosby.
-* fixed the `zero size buf in output` alert while combining [lua_need_request_body](http://wiki.nginx.org/HttpLuaModule#lua_need_request_body) on + [access_by_lua](http://wiki.nginx.org/HttpLuaModule#access_by_lua)/[rewrite_by_lua](http://wiki.nginx.org/HttpLuaModule#rewrite_by_lua) + [proxy_pass](http://wiki.nginx.org/HttpProxyModule#proxy_pass)/[fastcgi_pass](http://wiki.nginx.org/HttpFcgiModule#fastcgi_pass). thanks Liseen Wan (万珣新).
-* fixed issues with HTTP 1.0 HEAD requests.
-* made setting `ngx.header.HEADER` after sending out response headers throw out a Lua exception to help debugging issues like github issue #49. thanks Bill Donahue (ikhoyo).
-* fixed an issue regarding defining global variables in C header files: we should have defined the global `ngx_http_lua_exception` in a single compilation unit. thanks @姜大炮.
+<http://openresty.org/#Changes>
 
 Test Suite
 ==========
@@ -3976,7 +5034,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2012, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2012, by Zhang "agentzh" Yichun (章亦春) <agentzh@gmail.com>.
+Copyright (C) 2009-2012, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>.
 
 All rights reserved.
 
@@ -3995,6 +5053,7 @@ See Also
 * [lua-resty-redis](http://github.com/agentzh/lua-resty-redis) library based on ngx_lua cosocket.
 * [lua-resty-mysql](http://github.com/agentzh/lua-resty-mysql) library based on ngx_lua cosocket.
 * [lua-resty-upload](http://github.com/agentzh/lua-resty-upload) library based on ngx_lua cosocket.
+* [lua-resty-dns](http://github.com/agentzh/lua-resty-dns) library based on ngx_lua cosocket.
 * [lua-resty-string](http://github.com/agentzh/lua-resty-string) library based on [LuaJIT FFI](http://luajit.org/ext_ffi.html).
 * [Routing requests to different MySQL queries based on URI arguments](http://openresty.org/#RoutingMySQLQueriesBasedOnURIArgs)
 * [Dynamic Routing Based on Redis and Lua](http://openresty.org/#DynamicRoutingBasedOnRedis)
@@ -4009,5 +5068,5 @@ See Also
 
 Translations
 ============
-* [Chinese](http://wiki.nginx.org/HttpLuaModuleZh)
+* [Chinese](http://wiki.nginx.org/HttpLuaModuleZh) (still in progress)
 
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 0185146..6028f2d 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -20,7 +20,7 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
 
     if [ $ngx_found = no ]; then
         cat << END
-        $0: error: ngx_http_lua_module requires the Lua or LuaJIT library and LUAJIT_LIB is defined as $LUAJIT_LIB and LUAJIT_INC $LUAJIT_INC, but we cannot find LuaJIT there.
+        $0: error: ngx_http_lua_module requires the Lua or LuaJIT library and LUAJIT_LIB is defined as $LUAJIT_LIB and LUAJIT_INC (path for lua.h) $LUAJIT_INC, but we cannot find LuaJIT there.
 END
         exit 1
     fi
@@ -56,7 +56,7 @@ else
 
         if [ $ngx_found = no ]; then
             cat << END
-            $0: error: ngx_http_lua_module requires the Lua or LuaJIT library and LUA_LIB is defined as $LUA_LIB and LUA_INC is $LUA_INC, but we cannot find standard Lua there.
+            $0: error: ngx_http_lua_module requires the Lua or LuaJIT library and LUA_LIB is defined as $LUA_LIB and LUA_INC (path for lua.h) is $LUA_INC, but we cannot find standard Lua there.
 END
             exit 1
         fi
@@ -125,6 +125,18 @@ END
             fi
             . auto/feature
         fi
+
+        if [ $ngx_found = no ]; then
+            # Gentoo with LuaJIT-2.0
+            ngx_feature="LuaJIT library in /usr/"
+            ngx_feature_path="/usr/include/luajit-2.0"
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R/usr/lib -L/usr/lib -lm -lluajit-5.1"
+            else
+                ngx_feature_libs="-L/usr/lib -lm -lluajit-5.1"
+            fi
+            . auto/feature
+        fi
     fi
 fi
 
@@ -140,8 +152,102 @@ fi
 
 ngx_addon_name=ngx_http_lua_module
 HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_lua_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_lua_script.c $ngx_addon_dir/src/ngx_http_lua_log.c $ngx_addon_dir/src/ngx_http_lua_subrequest.c $ngx_addon_dir/src/ngx_http_lua_ndk.c $ngx_addon_dir/src/ngx_http_lua_control.c $ngx_addon_dir/src/ngx_http_lua_time.c $ngx_addon_dir/src/ngx_http_lua_misc.c $ngx_addon_dir/src/ngx_http_lua_variable.c $ngx_addon_dir/src/ngx_http_lua_string.c $ngx_addon_dir/src/ngx_http_lua_output.c $ngx_addon_dir/src/ngx_http_lua_headers.c $ngx_addon_dir/src/ngx_http_lua_req_body.c $ngx_addon_dir/src/ngx_http_lua_uri.c $ngx_addon_dir/src/ngx_http_lua_args.c $ngx_addon_dir/src/ngx_http_lua_ctx.c $ngx_addon_dir/src/ngx_http_lua_regex.c $ngx_addon_dir/src/ngx_http_lua_module.c $ngx_addon_dir/src/ngx_http_lua_headers_out.c $ngx_addon_dir/src/ngx_http_lua_headers_in.c $ngx_addon_dir/src/ngx_http_lua_directive.c $ngx_addon_dir/src/ngx_http_lua_consts.c $ngx_addon_dir/src/ngx_http_lua_exception.c $ngx_addon_dir/src/ngx_http_lua_util.c $ngx_addon_dir/src/ngx_http_lua_cache.c $ngx_addon_dir/src/ngx_http_lua_conf.c $ngx_addon_dir/src/ngx_http_lua_contentby.c $ngx_addon_dir/src/ngx_http_lua_rewriteby.c $ngx_addon_dir/src/ngx_http_lua_accessby.c $ngx_addon_dir/src/ngx_http_lua_setby.c $ngx_addon_dir/src/ngx_http_lua_capturefilter.c $ngx_addon_dir/src/ngx_http_lua_clfactory.c $ngx_addon_dir/src/ngx_http_lua_pcrefix.c $ngx_addon_dir/src/ngx_http_lua_headerfilterby.c $ngx_addon_dir/src/ngx_http_lua_shdict.c $ngx_addon_dir/src/ngx_http_lua_socket.c $ngx_addon_dir/src/ngx_http_lua_api.c"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_lua_script.h $ngx_addon_dir/src/ngx_http_lua_log.h $ngx_addon_dir/src/ngx_http_lua_subrequest.h $ngx_addon_dir/src/ngx_http_lua_ndk.h $ngx_addon_dir/src/ngx_http_lua_control.h $ngx_addon_dir/src/ngx_http_lua_time.h $ngx_addon_dir/src/ngx_http_lua_string.h $ngx_addon_dir/src/ngx_http_lua_misc.h $ngx_addon_dir/src/ngx_http_lua_variable.h $ngx_addon_dir/src/ngx_http_lua_output.h $ngx_addon_dir/src/ngx_http_lua_headers.h $ngx_addon_dir/src/ngx_http_lua_uri.h $ngx_addon_dir/src/ngx_http_lua_req_body.h $ngx_addon_dir/src/ngx_http_lua_args.h $ngx_addon_dir/src/ngx_http_lua_ctx.h $ngx_addon_dir/src/ngx_http_lua_regex.h $ngx_addon_dir/src/ngx_http_lua_common.h $ngx_addon_dir/src/ngx_http_lua_directive.h $ngx_addon_dir/src/ngx_http_lua_headers_out.h $ngx_addon_dir/src/ngx_http_lua_headers_in.h $ngx_addon_dir/src/ngx_http_lua_consts.h $ngx_addon_dir/src/ngx_http_lua_exception.h $ngx_addon_dir/src/ngx_http_lua_util.h $ngx_addon_dir/src/ngx_http_lua_cache.h $ngx_addon_dir/src/ngx_http_lua_conf.h $ngx_addon_dir/src/ngx_http_lua_contentby.h $ngx_addon_dir/src/ngx_http_lua_rewriteby.h $ngx_addon_dir/src/ngx_http_lua_accessby.h $ngx_addon_dir/src/ngx_http_lua_setby.h $ngx_addon_dir/src/ngx_http_lua_capturefilter.h $ngx_addon_dir/src/ngx_http_lua_clfactory.h $ngx_addon_dir/src/ngx_http_lua_pcrefix.h $ngx_addon_dir/src/ngx_http_lua_headerfilterby.h $ngx_addon_dir/src/ngx_http_lua_shdict.h $ngx_addon_dir/src/ngx_http_lua_socket.h $ngx_addon_dir/src/api/ngx_http_lua_api.h"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+                $ngx_addon_dir/src/ngx_http_lua_script.c \
+                $ngx_addon_dir/src/ngx_http_lua_log.c \
+                $ngx_addon_dir/src/ngx_http_lua_subrequest.c \
+                $ngx_addon_dir/src/ngx_http_lua_ndk.c \
+                $ngx_addon_dir/src/ngx_http_lua_control.c \
+                $ngx_addon_dir/src/ngx_http_lua_time.c \
+                $ngx_addon_dir/src/ngx_http_lua_misc.c \
+                $ngx_addon_dir/src/ngx_http_lua_variable.c \
+                $ngx_addon_dir/src/ngx_http_lua_string.c \
+                $ngx_addon_dir/src/ngx_http_lua_output.c \
+                $ngx_addon_dir/src/ngx_http_lua_headers.c \
+                $ngx_addon_dir/src/ngx_http_lua_req_body.c \
+                $ngx_addon_dir/src/ngx_http_lua_uri.c \
+                $ngx_addon_dir/src/ngx_http_lua_args.c \
+                $ngx_addon_dir/src/ngx_http_lua_ctx.c \
+                $ngx_addon_dir/src/ngx_http_lua_regex.c \
+                $ngx_addon_dir/src/ngx_http_lua_module.c \
+                $ngx_addon_dir/src/ngx_http_lua_headers_out.c \
+                $ngx_addon_dir/src/ngx_http_lua_headers_in.c \
+                $ngx_addon_dir/src/ngx_http_lua_directive.c \
+                $ngx_addon_dir/src/ngx_http_lua_consts.c \
+                $ngx_addon_dir/src/ngx_http_lua_exception.c \
+                $ngx_addon_dir/src/ngx_http_lua_util.c \
+                $ngx_addon_dir/src/ngx_http_lua_cache.c \
+                $ngx_addon_dir/src/ngx_http_lua_contentby.c \
+                $ngx_addon_dir/src/ngx_http_lua_rewriteby.c \
+                $ngx_addon_dir/src/ngx_http_lua_accessby.c \
+                $ngx_addon_dir/src/ngx_http_lua_setby.c \
+                $ngx_addon_dir/src/ngx_http_lua_capturefilter.c \
+                $ngx_addon_dir/src/ngx_http_lua_clfactory.c \
+                $ngx_addon_dir/src/ngx_http_lua_pcrefix.c \
+                $ngx_addon_dir/src/ngx_http_lua_headerfilterby.c \
+                $ngx_addon_dir/src/ngx_http_lua_shdict.c \
+                $ngx_addon_dir/src/ngx_http_lua_socket_tcp.c \
+                $ngx_addon_dir/src/ngx_http_lua_api.c \
+                $ngx_addon_dir/src/ngx_http_lua_logby.c \
+                $ngx_addon_dir/src/ngx_http_lua_sleep.c \
+                $ngx_addon_dir/src/ngx_http_lua_coroutine.c \
+                $ngx_addon_dir/src/ngx_http_lua_bodyfilterby.c \
+                $ngx_addon_dir/src/ngx_http_lua_initby.c \
+                $ngx_addon_dir/src/ngx_http_lua_socket_udp.c \
+                $ngx_addon_dir/src/ngx_http_lua_req_method.c \
+                $ngx_addon_dir/src/ngx_http_lua_phase.c \
+                $ngx_addon_dir/src/ngx_http_lua_uthread.c \
+                "
+
+NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
+                $ngx_addon_dir/src/ddebug.h \
+                $ngx_addon_dir/src/ngx_http_lua_script.h \
+                $ngx_addon_dir/src/ngx_http_lua_log.h \
+                $ngx_addon_dir/src/ngx_http_lua_subrequest.h \
+                $ngx_addon_dir/src/ngx_http_lua_ndk.h \
+                $ngx_addon_dir/src/ngx_http_lua_control.h \
+                $ngx_addon_dir/src/ngx_http_lua_time.h \
+                $ngx_addon_dir/src/ngx_http_lua_string.h \
+                $ngx_addon_dir/src/ngx_http_lua_misc.h \
+                $ngx_addon_dir/src/ngx_http_lua_variable.h \
+                $ngx_addon_dir/src/ngx_http_lua_output.h \
+                $ngx_addon_dir/src/ngx_http_lua_headers.h \
+                $ngx_addon_dir/src/ngx_http_lua_uri.h \
+                $ngx_addon_dir/src/ngx_http_lua_req_body.h \
+                $ngx_addon_dir/src/ngx_http_lua_args.h \
+                $ngx_addon_dir/src/ngx_http_lua_ctx.h \
+                $ngx_addon_dir/src/ngx_http_lua_regex.h \
+                $ngx_addon_dir/src/ngx_http_lua_common.h \
+                $ngx_addon_dir/src/ngx_http_lua_directive.h \
+                $ngx_addon_dir/src/ngx_http_lua_headers_out.h \
+                $ngx_addon_dir/src/ngx_http_lua_headers_in.h \
+                $ngx_addon_dir/src/ngx_http_lua_consts.h \
+                $ngx_addon_dir/src/ngx_http_lua_exception.h \
+                $ngx_addon_dir/src/ngx_http_lua_util.h \
+                $ngx_addon_dir/src/ngx_http_lua_cache.h \
+                $ngx_addon_dir/src/ngx_http_lua_contentby.h \
+                $ngx_addon_dir/src/ngx_http_lua_rewriteby.h \
+                $ngx_addon_dir/src/ngx_http_lua_accessby.h \
+                $ngx_addon_dir/src/ngx_http_lua_setby.h \
+                $ngx_addon_dir/src/ngx_http_lua_capturefilter.h \
+                $ngx_addon_dir/src/ngx_http_lua_clfactory.h \
+                $ngx_addon_dir/src/ngx_http_lua_pcrefix.h \
+                $ngx_addon_dir/src/ngx_http_lua_headerfilterby.h \
+                $ngx_addon_dir/src/ngx_http_lua_shdict.h \
+                $ngx_addon_dir/src/ngx_http_lua_socket_tcp.h \
+                $ngx_addon_dir/src/api/ngx_http_lua_api.h \
+                $ngx_addon_dir/src/ngx_http_lua_logby.h \
+                $ngx_addon_dir/src/ngx_http_lua_sleep.h \
+                $ngx_addon_dir/src/ngx_http_lua_coroutine.h \
+                $ngx_addon_dir/src/ngx_http_lua_bodyfilterby.h \
+                $ngx_addon_dir/src/ngx_http_lua_initby.h \
+                $ngx_addon_dir/src/ngx_http_lua_socket_udp.h \
+                $ngx_addon_dir/src/ngx_http_lua_req_method.h \
+                $ngx_addon_dir/src/ngx_http_lua_phase.h \
+                $ngx_addon_dir/src/ngx_http_lua_probe.h \
+                $ngx_addon_dir/src/ngx_http_lua_uthread.h \
+                "
+
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
 
 ngx_feature="export symbols by default"
@@ -158,6 +264,9 @@ if [ $ngx_found = yes ]; then
     CORE_LIBS="-Wl,-E $CORE_LIBS"
 fi
 
+NGX_DTRACE_PROVIDERS="$NGX_DTRACE_PROVIDERS $ngx_addon_dir/dtrace/ngx_lua_provider.d"
+NGX_TAPSET_SRCS="$NGX_TAPSET_SRCS $ngx_addon_dir/tapset/ngx_lua.stp"
+
 USE_MD5=YES
 USE_SHA1=YES
 
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index dace143..c800749 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ This module is under active development and is production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module/tags v0.5.0rc28] released on 16 May 2012.
+This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module/tags v0.7.8] released on 8 December 2012.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -116,7 +116,7 @@ This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module
         location /foo {
             rewrite_by_lua '
                 res = ngx.location.capture("/memc",
-                    { args = { cmd = 'incr', key = ngx.var.uri } }
+                    { args = { cmd = "incr", key = ngx.var.uri } }
                 )
             ';
  
@@ -161,7 +161,7 @@ This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module
            client_body_buffer_size 100k;
  
            access_by_lua '
-               -- check the client IP addr is in our black list
+               -- check the client IP address is in our black list
                if ngx.var.remote_addr == "132.5.72.3" then
                    ngx.exit(ngx.HTTP_FORBIDDEN)
                end
@@ -183,13 +183,30 @@ This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module
 
 = Description =
 
-This module embeds Lua, via the standard Lua interpreter or LuaJIT, into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
+This module embeds Lua, via the standard Lua interpreter or [http://luajit.org/luajit.html LuaJIT 2.0], into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
 
 Unlike [http://httpd.apache.org/docs/2.3/mod/mod_lua.html Apache's mod_lua] and [http://redmine.lighttpd.net/wiki/1/Docs:ModMagnet Lighttpd's mod_magnet], Lua code executed using this module can be ''100% non-blocking'' on network traffic as long as the [[#Nginx API for Lua|Nginx API for Lua]] provided by this module is used to handle
-requests to upstream services such as mysql, postgresql, memcached, redis, or upstream http web services. (See [[#ngx.location.capture|ngx.location.capture]], [[#ngx.location.capture_multi|ngx.location.capture_multi]], [[#ngx.socket.tcp|ngx.socket.tcp]], [[HttpDrizzleModule]], [http://github.com/FRiCKLE/ngx_postgres/ ngx_postgres], [[HttpMemcModule]], [[HttpRedis2Module]] and [[HttpProxyModule]] modules for details).
+requests to upstream services such as MySQL, PostgreSQL, Memcached, Redis, or upstream HTTP web services.
 
-The Lua interpreter or LuaJIT instance is shared across all the requests in a single nginx worker process but request contexts are segregated using lightweight Lua coroutines. 
-Loaded Lua modules persist in the nginx worker process level resulting in a small memory footprint even when under heavy loads.
+At least the following Lua libraries and Nginx modules can be used with this ngx_lua module:
+
+* [https://github.com/agentzh/lua-resty-memcached lua-resty-memcached]
+* [https://github.com/agentzh/lua-resty-mysql lua-resty-mysql]
+* [https://github.com/agentzh/lua-resty-redis lua-resty-redis]
+* [https://github.com/agentzh/lua-resty-dns lua-resty-dns]
+* [https://github.com/agentzh/lua-resty-upload lua-resty-upload]
+* [[HttpMemcModule|ngx_memc]]
+* [https://github.com/FRiCKLE/ngx_postgres ngx_postgres]
+* [[HttpRedis2Module|ngx_redis2]]
+* [[HttpRedisModule|ngx_redis]]
+* [[HttpProxyModule|ngx_proxy]]
+* [[HttpFastcgiModule|ngx_fastcgi]]
+
+Almost all the Nginx modules can be used with this ngx_lua module by means of [[#ngx.location.capture|ngx.location.capture]] or [[#ngx.location.capture_multi|ngx.location.capture_multi]] but it is recommended to use those <code>lua-resty-*</code> libraries instead of creating subrequests to access the Nginx upstream modules because the former is usually much more flexible and memory-efficient.
+
+The Lua interpreter or LuaJIT instance is shared across all the requests in a single nginx worker process but request contexts are segregated using lightweight Lua coroutines.
+
+Loaded Lua modules persist in the nginx worker process level resulting in a small memory footprint in Lua even when under heavy loads.
 
 = Directives =
 
@@ -211,14 +228,14 @@ and the Lua <code>package.loaded</code> table will be cleared
 at the entry point of every request (such that Lua modules
 will not be cached either). With this in place, developers can adopt an edit-and-refresh approach.
 
-Please note however, that Lua code inlined into nginx.conf
+Please note however, that Lua code written inlined within nginx.conf
 such as those specified by [[#set_by_lua|set_by_lua]], [[#content_by_lua|content_by_lua]],
 [[#access_by_lua|access_by_lua]], and [[#rewrite_by_lua|rewrite_by_lua]] will ''always'' be
 cached because only the Nginx config file parser can correctly parse the <code>nginx.conf</code>
 file and the only ways to to reload the config file
 are to send a <code>HUP</code> signal or to restart Nginx.
 
-The ngx_lua module does not currently support the <code>stat</code> mode available with the 
+The ngx_lua module does not currently support the <code>stat</code> mode available with the
 Apache <code>mod_lua</code> module but this is planned for implementation in the future.
 
 Disabling the Lua code cache is strongly
@@ -258,7 +275,7 @@ Sets the Lua module search path used by scripts specified by [[#set_by_lua|set_b
 [[#content_by_lua|content_by_lua]] and others. The path string is in standard Lua path form, and <code>;;</code>
 can be used to stand for the original search paths.
 
-Since the <code>v0.5.0rc29</code> release, the special notation <code>$prefix</code> or <code>${prefix}</code> can be used in the search path string to indicate the path of the <code>server prefix</code> usually determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+As from the <code>v0.5.0rc29</code> release, the special notation <code>$prefix</code> or <code>${prefix}</code> can be used in the search path string to indicate the path of the <code>server prefix</code> usually determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
 
 == lua_package_cpath ==
 
@@ -272,22 +289,104 @@ Sets the Lua C-module search path used by scripts specified by [[#set_by_lua|set
 [[#content_by_lua|content_by_lua]] and others. The cpath string is in standard Lua cpath form, and <code>;;</code>
 can be used to stand for the original cpath.
 
-Since the <code>v0.5.0rc29</code> release, the special notation <code>$prefix</code> or <code>${prefix}</code> can be used in the search path string to indicate the path of the <code>server prefix</code> usually determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+As from the <code>v0.5.0rc29</code> release, the special notation <code>$prefix</code> or <code>${prefix}</code> can be used in the search path string to indicate the path of the <code>server prefix</code> usually determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+
+== init_by_lua ==
+
+'''syntax:''' ''init_by_lua <lua-script-str>''
+
+'''context:''' ''http''
+
+'''phase:''' ''loading-config''
+
+Runs the Lua code specified by the argument <code><lua-script-str></code> on the global Lua VM level when the Nginx master process (if any) is loading the Nginx config file.
+
+When Nginx receives the <code>HUP</code> signal and starts reloading the config file, the Lua VM will also be re-created and <code>init_by_lua</code> will run again on the new Lua VM.
+
+Usually you can register (true) Lua global variables or pre-load Lua modules at server start-up by means of this hook. Here is an example for pre-loading Lua modules:
+
+<geshi lang="nginx">
+    init_by_lua 'require "cjson"';
+
+    server {
+        location = /api {
+            content_by_lua '
+                ngx.say(cjson.encode({dog = 5, cat = 6}))
+            ';
+        }
+    }
+</geshi>
+
+You can also initialize the [[#lua_shared_dict|lua_shared_dict]] shm storage at this phase. Here is an example for this:
+
+<geshi lang="nginx">
+    lua_shared_dict dogs 1m;
+
+    init_by_lua '
+        local dogs = ngx.shared.dogs;
+        dogs:set("Tom", 56)
+    ';
+
+    server {
+        location = /api {
+            content_by_lua '
+                local dogs = ngx.shared.dogs;
+                ngx.say(dogs:get("Tom"))
+            ';
+        }
+    }
+</geshi>
+
+But note that, the [[#lua_shared_dict|lua_shared_dict]]'s shm storage will not be cleared through a config reload (via the <code>HUP</code> signal, for example). So if you do ''not'' want to re-initialize the shm storage in your <code>init_by_lua</code> code in this case, then you just need to set a custom flag in the shm storage and always check the flag in your <code>init_by_lua</code> code.
+
+Because the Lua code in this context runs before Nginx forks its worker processes (if any), data or code loaded here will enjoy the [http://en.wikipedia.org/wiki/Copy-on-write Copy-on-write (COW)] feature provided by many operating systems among all the worker processes, thus saving a lot of memory.
+
+Only a small set of the [[#Nginx API for Lua|Nginx API for Lua]] is supported in this context:
+
+* Logging APIs: [[#ngx.log|ngx.log]] and [[#print|print]],
+* Shared Dictionary API: [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+More Nginx APIs for Lua may be supported in this context upon future user requests.
+
+Basically you can safely use Lua libraries that do blocking I/O in this very context because blocking the master process during server start-up is completely okay. Even the Nginx core does blocking I/O (at least on resolving upstream's host names) at the configure-loading phase.
+
+You should be very careful about potential security vulnerabilities in your Lua code registered in this context because the Nginx master process is often run under the <code>root</code> account.
+
+This directive was first introduced in the <code>v0.5.5</code> release.
+
+== init_by_lua_file ==
+
+'''syntax:''' ''init_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''http''
+
+'''phase:''' ''loading-config''
+
+Equivalent to [[#init_by_lua|init_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code or [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
+
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+
+This directive was first introduced in the <code>v0.5.5</code> release.
 
 == set_by_lua ==
 
 '''syntax:''' ''set_by_lua $res <lua-script-str> [$arg1 $arg2 ...]''
 
-'''context:''' ''main, server, location, server if, location if''
+'''context:''' ''server, server if, location, location if''
 
-'''phase:''' ''rewrite''
+'''phase:''' ''server-rewrite, rewrite''
 
 Executes code specified in <code><lua-script-str></code> with optional input arguments <code>$arg1 $arg2 ...</code>, and returns string output to <code>$res</code>. 
 The code in <code><lua-script-str></code> can make [[#Nginx API for Lua|API calls]] and can retrieve input arguments from the <code>ngx.arg</code> table (index starts from <code>1</code> and increases sequentially).
 
 This directive is designed to execute short, fast running code blocks as the Nginx event loop is blocked during code execution. Time consuming code sequences should therefore be avoided.
 
-Note that I/O operations such as [[#ngx.say|ngx.say]], [[#ngx.exec|ngx.exec]], [[HttpEchoModule#echo|echo]] and similar are not permitted within the context of this directive.
+Note that the following API functions are currently disabled within this context:
+
+* Output API functions (e.g., [[#ngx.say|ngx.say]] and [[#ngx.send_headers|ngx.send_headers]])
+* Control API functions (e.g., [[#ngx.exit|ngx.exit]]) 
+* Subrequest API functions (e.g., [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]])
+* Cosocket API functions (e.g., [[#ngx.socket.tcp|ngx.socket.tcp]] and [[#ngx.req.socket|ngx.req.socket]]).
 
 In addition, note that this directive can only write out a value to a single Nginx variable at
 a time. However, a workaround is possible using the [[#ngx.var.VARIABLE|ngx.var.VARIABLE]] interface.
@@ -316,22 +415,22 @@ This directive can be freely mixed with all directives of the [[HttpRewriteModul
     set $baz "bar: $bar";  # $baz == "bar: 33"
 </geshi>
 
-Since the <code>0.5.0rc29</code> release, Nginx variable interpolation is disabled in the <code><lua-script-str></code> argument of this directive, and you can use the dollar sign character (<code>$</code>) directly.
+As from the <code>v0.5.0rc29</code> release, Nginx variable interpolation is disabled in the <code><lua-script-str></code> argument of this directive and therefore, the dollar sign character (<code>$</code>) can be used directly.
 
 This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit] module.
 
 == set_by_lua_file ==
 '''syntax:''' ''set_by_lua_file $res <path-to-lua-script-file> [$arg1 $arg2 ...]''
 
-'''context:''' ''main, server, location, server if, location if''
+'''context:''' ''server, server if, location, location if''
 
-'''phase:''' ''rewrite''
+'''phase:''' ''server-rewrite, rewrite''
 
-Equivalent to [[#set_by_lua|set_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code to be executed.
+Equivalent to [[#set_by_lua|set_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed. 
 
 Nginx variable interpolation is supported in the <code><path-to-lua-script-file></code> argument string of this directive. But special care must be taken for injection attacks.
 
-When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absoluate path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached 
 and the Nginx config must be reloaded each time the Lua source file is modified.
@@ -361,11 +460,11 @@ Do not use this directive and other content handler directives in the same locat
 
 '''phase:''' ''content''
 
-Equivalent to [[#content_by_lua|content_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code to be executed.
+Equivalent to [[#content_by_lua|content_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
 
 Nginx variables can be used in the <code><path-to-lua-script-file></code> string to provide flexibility. This however carries some risks and is not ordinarily recommended.
 
-When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absoluate path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached 
 and the Nginx config must be reloaded each time the Lua source file is modified.
@@ -447,7 +546,7 @@ Note that the [http://www.grid.net.ru/nginx/eval.en.html ngx_eval] module can be
     }
 </geshi>
 
-can be implemented in <code>ngx_lua</code> as:
+can be implemented in ngx_lua as:
 
 <geshi lang="nginx">
     location = /check-spam {
@@ -459,7 +558,7 @@ can be implemented in <code>ngx_lua</code> as:
         rewrite_by_lua '
             local res = ngx.location.capture("/check-spam")
             if res.body == "spam" then
-                ngx.redirect("/terms-of-use.html")
+                return ngx.redirect("/terms-of-use.html")
             end
         ';
  
@@ -483,7 +582,9 @@ If the [[HttpRewriteModule]]'s [[HttpRewriteModule#rewrite|rewrite]] directive i
     }
 </geshi>
 
-Here the Lua code <code>ngx.exit(503)</code> will never run. This will be the case if <code>rewrite ^ /bar last</code> is used as this will similarly initiate an internal redirection. If the <code>break</code> modifier is used instead, there will be no internal redirection and the rewrite_by_lua code will be executed.
+Here the Lua code <code>ngx.exit(503)</code> will never run. This will be the case if <code>rewrite ^ /bar last</code> is used as this will similarly initiate an internal redirection. If the <code>break</code> modifier is used instead, there will be no internal redirection and the <code>rewrite_by_lua</code> code will be executed.
+
+The <code>rewrite_by_lua</code> code will always run at the end of the <code>rewrite</code> request-processing phase unless [[#rewrite_by_lua_no_postpone|rewrite_by_lua_no_postpone]] is turned on.
 
 == rewrite_by_lua_file ==
 
@@ -493,14 +594,16 @@ Here the Lua code <code>ngx.exit(503)</code> will never run. This will be the ca
 
 '''phase:''' ''rewrite tail''
 
-Equivalent to [[#rewrite_by_lua|rewrite_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code to be executed.
+Equivalent to [[#rewrite_by_lua|rewrite_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
 
 Nginx variables can be used in the <code><path-to-lua-script-file></code> string to provide flexibility. This however carries some risks and is not ordinarily recommended.
 
-When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absoluate path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached and the Nginx config must be reloaded each time the Lua source file is modified. The Lua code cache can be temporarily disabled during development by switching [[#lua_code_cache|lua_code_cache]] <code>off</code> in <code>nginx.conf</code> to avoid reloading Nginx.
 
+The <code>rewrite_by_lua_file</code> code will always run at the end of the <code>rewrite</code> request-processing phase unless [[#rewrite_by_lua_no_postpone|rewrite_by_lua_no_postpone]] is turned on.
+
 == access_by_lua ==
 
 '''syntax:''' ''access_by_lua <lua-script-str>''
@@ -542,7 +645,7 @@ Note that the [http://mdounin.ru/hg/ngx_http_auth_request_module/ ngx_auth_reque
     }
 </geshi>
 
-can be implemented in <code>ngx_lua</code> as:
+can be implemented in ngx_lua as:
 
 <geshi lang="nginx">
     location / {
@@ -576,11 +679,11 @@ Note that when calling <code>ngx.exit(ngx.OK)</code> within a [[#access_by_lua|a
 
 '''phase:''' ''access tail''
 
-Equivalent to [[#access_by_lua|access_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code to be executed.
+Equivalent to [[#access_by_lua|access_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
 
 Nginx variables can be used in the <code><path-to-lua-script-file></code> string to provide flexibility. This however carries some risks and is not ordinarily recommended.
 
-When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absoluate path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
 
 When the Lua code cache is turned on (by default), the user code is loaded once at the first request and cached 
 and the Nginx config must be reloaded each time the Lua source file is modified.
@@ -594,11 +697,14 @@ The Lua code cache can be temporarily disabled during development by switching [
 
 '''phase:''' ''output-header-filter''
 
-Uses Lua code specified in <code><lua-script-str></code> to define an output header filter. Note that the following API functions are currently disabled within this context:
+Uses Lua code specified in <code><lua-script-str></code> to define an output header filter.
+
+Note that the following API functions are currently disabled within this context:
 
 * Output API functions (e.g., [[#ngx.say|ngx.say]] and [[#ngx.send_headers|ngx.send_headers]])
-* Control API functions (e.g., [[#ngx.exit|ngx.exit]]) 
+* Control API functions (e.g., [[#ngx.exit|ngx.exit]] and [[#ngx.exec|ngx.exec]])
 * Subrequest API functions (e.g., [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]])
+* Cosocket API functions (e.g., [[#ngx.socket.tcp|ngx.socket.tcp]] and [[#ngx.req.socket|ngx.req.socket]]).
 
 Here is an example of overriding a response header (or adding one if absent) in our Lua header filter:
 
@@ -619,12 +725,184 @@ This directive was first introduced in the <code>v0.2.1rc20</code> release.
 
 '''phase:''' ''output-header-filter''
 
-Equivalent to [[#header_filter_by_lua|header_filter_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code to be executed.
+Equivalent to [[#header_filter_by_lua|header_filter_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
 
-When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absoluate path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
 
 This directive was first introduced in the <code>v0.2.1rc20</code> release.
 
+== body_filter_by_lua ==
+
+'''syntax:''' ''body_filter_by_lua <lua-script-str>''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''output-body-filter''
+
+Uses Lua code specified in <code><lua-script-str></code> to define an output body filter.
+
+The input data chunk is passed via [[#ngx.arg|ngx.arg]][1] (as a Lua string value) and the "eof" flag indicating the end of the response body data stream is passed via [[#ngx.arg|ngx.arg]][2] (as a Lua boolean value).
+
+Behind the scene, the "eof" flag is just the <code>last_buf</code> flag of the nginx chain link buffers. And in the context of an Nginx subrequest, there is no "eof" flag at all, due to the underlying limitation in the Nginx core.
+
+The output data stream can be aborted immediately by running the following Lua statement:
+
+<geshi lang="lua">
+    return ngx.ERROR
+</geshi>
+
+This will truncate the response body and usually result in incomplete and also invalid responses.
+
+The Lua code can pass its own modified version of the input data chunk to the downstream Nginx output body filters by overriding [[#ngx.arg|ngx.arg]][1] with a Lua string or a Lua table of strings. For example, to transform all the lowercase letters in the response body, we can just write:
+
+<geshi lang="nginx">
+    location / {
+        proxy_pass http://mybackend;
+        body_filter_by_lua 'ngx.arg[1] = string.upper(ngx.arg[1])';
+    }
+</geshi>
+
+When setting <code>nil</code> or an empty Lua string value to <code>ngx.arg[1]</code>, no data chunk will be passed to the downstream Nginx output filters at all.
+
+Likewise, new "eof" flag can also be specified by setting a boolean value to [[#ngx.arg|ngx.arg]][2]. For example,
+
+<geshi lang="nginx">
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk = ngx.arg[1]
+            if string.match(chunk, "hello") then
+                ngx.arg[2] = true  -- new eof
+                return
+            end
+
+            -- just throw away any remaining chunk data
+            ngx.arg[1] = nil
+        ';
+    }
+</geshi>
+
+Then <code>GET /t</code> will just return the output
+
+<geshi lang="text">
+    hello world
+</geshi>
+
+That is, when the body filter sees a chunk containing the word "hello", then it will set the "eof" flag to true immediately, resulting in truncated but still valid responses.
+
+When the Lua code may change the length of the response body, then it is required to always clear out the <code>Content-Length</code> response header (if any) in a header filter to enforce streaming output, as in
+
+<geshi lang="nginx">
+    location /foo {
+        # fastcgi_pass/proxy_pass/...
+
+        header_filter_by_lua 'ngx.header.content_length = nil';
+        body_filter_by_lua 'ngx.arg[1] = {string.len(arg[1]), "\n"}'
+    }
+</geshi>
+
+Note that the following API functions are currently disabled within this context:
+
+* Output API functions (e.g., [[#ngx.say|ngx.say]] and [[#ngx.send_headers|ngx.send_headers]])
+* Control API functions (e.g., [[#ngx.exit|ngx.exit]] and [[#ngx.exec|ngx.exec]])
+* Subrequest API functions (e.g., [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]])
+* Cosocket API functions (e.g., [[#ngx.socket.tcp|ngx.socket.tcp]] and [[#ngx.req.socket|ngx.req.socket]]).
+
+Nginx output filters may be called multiple times for a single request because response body may be delivered in chunks. Thus, the Lua code specified by in this directive may also run multiple times in the lifetime of a single HTTP request.
+
+This directive was first introduced in the <code>v0.5.0rc32</code> release.
+
+== body_filter_by_lua_file ==
+
+'''syntax:''' ''body_filter_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''output-body-filter''
+
+Equivalent to [[#body_filter_by_lua|body_filter_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
+
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+
+This directive was first introduced in the <code>v0.5.0rc32</code> release.
+
+== log_by_lua ==
+
+'''syntax:''' ''log_by_lua <lua-script-str>''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''log''
+
+Run the Lua source code inlined as the <code><lua-script-str></code> at the <code>log</code> request processing phase. This does not replace the current access logs, but runs after.
+
+Note that the following API functions are currently disabled within this context:
+
+* Output API functions (e.g., [[#ngx.say|ngx.say]] and [[#ngx.send_headers|ngx.send_headers]])
+* Control API functions (e.g., [[#ngx.exit|ngx.exit]]) 
+* Subrequest API functions (e.g., [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]])
+* Cosocket API functions (e.g., [[#ngx.socket.tcp|ngx.socket.tcp]] and [[#ngx.req.socket|ngx.req.socket]]).
+
+Here is an example of gathering average data for [[HttpUpstreamModule#$upstream_response_time|$upstream_response_time]]:
+
+<geshi lang="nginx">
+    lua_shared_dict log_dict 5M;
+
+    server {
+        location / {
+            proxy_pass http://mybackend;
+
+            log_by_lua '
+                local log_dict = ngx.shared.log_dict
+                local upstream_time = tonumber(ngx.var.upstream_response_time)
+
+                local sum = log_dict:get("upstream_time-sum") or 0
+                sum = sum + upstream_time
+                log_dict:set("upstream_time-sum", sum)
+
+                local newval, err = log_dict:incr("upstream_time-nb", 1)
+                if not newval and err == "not found" then
+                    log_dict:add("upstream_time-nb", 0)
+                    log_dict:incr("upstream_time-nb", 1)
+                end
+            ';
+        }
+
+        location = /status {
+            content_by_lua '
+                local log_dict = ngx.shared.log_dict
+                local sum = log_dict:get("upstream_time-sum")
+                local nb = log_dict:get("upstream_time-nb")
+    
+                if nb and sum then
+                    ngx.say("average upstream response time: ", sum / nb,
+                            " (", nb, " reqs)")
+                else
+                    ngx.say("no data yet")
+                end
+            ';
+        }
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.5.0rc31</code> release.
+
+== log_by_lua_file ==
+
+'''syntax:''' ''log_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''log''
+
+Equivalent to [[#log_by_lua|log_by_lua]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
+
+When a relative path like <code>foo/bar.lua</code> is given, they will be turned into the absolute path relative to the <code>server prefix</code> path determined by the <code>-p PATH</code> command-line option while starting the Nginx server.
+
+This directive was first introduced in the <code>v0.5.0rc31</code> release.
+
 == lua_need_request_body ==
 
 '''syntax:''' ''lua_need_request_body <on|off>''
@@ -638,7 +916,7 @@ This directive was first introduced in the <code>v0.2.1rc20</code> release.
 Determines whether to force the request body data to be read before running rewrite/access/access_by_lua* or not. The Nginx core does not read the client request body by default and if request body data is required, then this directive should be turned <code>on</code> or the [[#ngx.req.read_body|ngx.req.read_body]] function should be called within the Lua code.
 
 To read the request body data within the [[HttpCoreModule#$request_body|$request_body]] variable, 
-[[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]] must have the same value as [[HttpCoreModule#client_max_body_size|client_max_body_size]]. Because when the content length exceeds [[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]] but less than [[HttpCoreModule#client_max_body_size|client_max_body_size]], Nginx will automatically buffer the data into a temporary file on the disk, which will lead to empty value in the [[HttpCoreModule#$request_body|$request_body]] variable.
+[[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]] must have the same value as [[HttpCoreModule#client_max_body_size|client_max_body_size]]. Because when the content length exceeds [[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]] but less than [[HttpCoreModule#client_max_body_size|client_max_body_size]], Nginx will buffer the data into a temporary file on the disk, which will lead to empty value in the [[HttpCoreModule#$request_body|$request_body]] variable.
 
 If the current location includes [[#rewrite_by_lua|rewrite_by_lua]] or [[#rewrite_by_lua_file|rewrite_by_lua_file]] directives,
 then the request body will be read just before the [[#rewrite_by_lua|rewrite_by_lua]] or [[#rewrite_by_lua_file|rewrite_by_lua_file]] code is run (and also at the
@@ -660,7 +938,7 @@ This also applies to [[#access_by_lua|access_by_lua]] and [[#access_by_lua_file|
 
 '''phase:''' ''depends on usage''
 
-Declares a shared memory zone, <code><name></code>, to serve as storage for the shm-based Lua dictionary <code>ngx.shared.<name></code>.
+Declares a shared memory zone, <code><name></code>, to serve as storage for the shm based Lua dictionary <code>ngx.shared.<name></code>.
 
 The <code><size></code> argument accepts size units such as <code>k</code> and <code>m</code>:
 
@@ -755,7 +1033,7 @@ Specifies the size limit (in terms of connection count) for every cosocket conne
 
 Default to 30 connections for every pool.
 
-When the connection pool is exceeding the size limit, the least recently used (idle) connection already in the pool will be closed automatically to make room for the current connection. 
+When the connection pool exceeds the available size limit, the least recently used (idle) connection already in the pool will be closed to make room for the current connection.
 
 Note that the cosocket connection pool is per nginx worker process rather than per nginx server instance, so so size limit specified here also applies to every single nginx worker process.
 
@@ -769,12 +1047,24 @@ This directive was first introduced in the <code>v0.5.0rc1</code> release.
 
 '''context:''' ''http, server, location''
 
-This directive controls the default maximal idle time of the connections in the cosocket built-in connection pool. When this timeout reaches, idle connections will be closed automatically and removed from the pool. This setting can be overridden by cosocket objects' [[#tcpsock:setkeepalive|setkeepalive]] method.
+This directive controls the default maximal idle time of the connections in the cosocket built-in connection pool. When this timeout reaches, idle connections will be closed and removed from the pool. This setting can be overridden by cosocket objects' [[#tcpsock:setkeepalive|setkeepalive]] method.
 
-The <code><time></code> argument can be an integer, with an optional time unit, like <code>s</code> (second), <code>ms</code> (millisecond), <code>m</code> (minute). The default time unit is <code>s</code>, ie, "second". The default setting is <code>60s</code>.
+The <code><time></code> argument can be an integer, with an optional time unit, like <code>s</code> (second), <code>ms</code> (millisecond), <code>m</code> (minute). The default time unit is <code>s</code>, i.e., "second". The default setting is <code>60s</code>.
 
 This directive was first introduced in the <code>v0.5.0rc1</code> release.
 
+== lua_socket_log_errors ==
+
+'''syntax:''' ''lua_socket_log_errors on|off''
+
+'''default:''' ''lua_socket_log_errors on''
+
+'''context:''' ''http, server, location''
+
+This directive can be used to toggle error logging when a failure occurs for the TCP or UDP cosockets. If you are already doing proper error handling and logging in your Lua code, then it is recommended to turn this directive off to prevent data flushing in your nginx error log files (which is usually rather expensive).
+
+This directive was first introduced in the <code>v0.5.13</code> release.
+
 == lua_http10_buffering ==
 
 '''syntax:''' ''lua_http10_buffering on|off''
@@ -783,11 +1073,11 @@ This directive was first introduced in the <code>v0.5.0rc1</code> release.
 
 '''context:''' ''http, server, location, location-if''
 
-Enables or disables the automatic response caching for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which replies on a proper <code>Content-Length</code> response header.
+Enables or disables response caching for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which replies on a proper <code>Content-Length</code> response header.
 
-If the Lua code explicitly sets a <code>Content-Length</code> response header before sending the headers (either explicity via [[#ngx.send_headers|ngx.send_headers]] or implicitly via the first [[#ngx.say|ngx.say]] or [[#ngx.print|ngx.print]] call).
+If the Lua code explicitly sets a <code>Content-Length</code> response header before sending the headers (either explicitly via [[#ngx.send_headers|ngx.send_headers]] or implicitly via the first [[#ngx.say|ngx.say]] or [[#ngx.print|ngx.print]] call).
 
-If you want to output huge response data in a streaming fashion (via the [[#ngx.flush|ngx.flush]] call, for example), then you MUST turn off this directive to prevent memory footprint boost.
+To output very large response data in a streaming fashion (via the [[#ngx.flush|ngx.flush]] call, for example), this directive MUST be turned off to minimize memory usage.
 
 This directive is turned <code>on</code> by default.
 
@@ -805,28 +1095,68 @@ Controls whether or not to disable postponing [[#rewrite_by_lua|rewrite_by_lua]]
 
 This directive was first introduced in the <code>v0.5.0rc29</code> release.
 
+== lua_transform_underscores_in_response_headers ==
+
+'''syntax:''' ''lua_transform_underscores_in_response_headers on|off''
+
+'''default:''' ''lua_transform_underscores_in_response_headers on''
+
+'''context:''' ''http, server, location, location-if''
+
+Controls whether to transform underscores (<code>_</code>) in the response header names specified in the [[#ngx.header.HEADER|ngx.header.HEADER]] API to hypens (<code>-</code>).
+
+This directive was first introduced in the <code>v0.5.0rc32</code> release.
+
+== lua_check_client_abort ==
+
+'''syntax:''' ''lua_check_client_abort on|off''
+
+'''default:''' ''lua_check_client_abort off''
+
+'''context:''' ''http, server, location, location-if''
+
+This directive controls whether to check for premature client connection abortion.
+
+When this directive is turned on, the ngx_lua module will monitor the premature connection close event on the downstream connections. And when there is such an event, it will call the user Lua function callback (registered by [[#ngx.on_abort|ngx.on_abort]]) or just stop and clean up all the Lua "light threads" running in the current request's request handler when there is no user callback function registered.
+
+According to the current implementation, however, if the client closes the connection before the Lua code finishes reading the request body data via [[#ngx.req.socket|ngx.req.socket]], then ngx_lua will neither stop all the running "light threads" nor call the user callback (if [[#ngx.on_abort|ngx.on_abort]] has been called). Instead, the reading operation on [[#ngx.req.socket|ngx.req.socket]] will just return the error message "client aborted" as the second return value (the first return value is surely <code>nil</code>).
+
+When TCP keepalive is disabled, it is relying on the client side to close the socket gracefully (by sending a <code>FIN</code> packet or something like that). For (soft) real-time web applications, it is highly recommended to configure the [http://tldp.org/HOWTO/TCP-Keepalive-HOWTO/overview.html TCP keepalive] support in your system's TCP stack implementation in order to detect "half-open" TCP connections in time.
+
+For example, on Linux, you can configure the standard [[HttpCoreModule#listen|listen]] directive in your <code>nginx.conf</code> file like this:
+
+<geshi lang="nginx">
+    listen 80 so_keepalive=2s:2s:8;
+</geshi>
+
+On FreeBSD, you can only tune the system-wide configuration for TCP keepalive, for example:
+
+    # sysctl net.inet.tcp.keepintvl=2000
+    # sysctl net.inet.tcp.keepidle=2000
+
+This directive was first introduced in the <code>v0.7.4</code> release.
+
+See also [[#ngx.on_abort|ngx.on_abort]].
+
 = Nginx API for Lua =
 == Introduction ==
 The various <code>*_by_lua</code> and <code>*_by_lua_file</code> configuration directives serve as gateways to the Lua API within the <code>nginx.conf</code> file. The Nginx Lua API described below can only be called within the user Lua code run in the context of these configuration directives.
 
-The API is exposed to Lua in the form of two standard packages <code>ngx</code> and <code>ndk</code>. These packages are in the default global scope within <code>ngx_lua</code> and are always available within <code>ngx_lua</code> directives.
+The API is exposed to Lua in the form of two standard packages <code>ngx</code> and <code>ndk</code>. These packages are in the default global scope within ngx_lua and are always available within ngx_lua directives.
 
-The packages can be introduced into external Lua modules by using the [http://www.lua.org/manual/5.1/manual.html#pdf-package.seeall package.seeall] option:
+The packages can be introduced into external Lua modules like this:
 
 <geshi lang="lua">
-    module("my_module", package.seeall)
+    local say = ngx.say
 
-    function say(a) ngx.say(a) end
+    module(...)
+
+    function foo(a) 
+        say(a) 
+    end
 </geshi>
 
-Alternatively, they can be imported to external Lua modules by using file scoped local Lua variables:
-
-<geshi lang="lua">
-    local ngx = ngx
-    module("my_module")
-
-    function say(a) ngx.say(a) end
-</geshi>
+Use of the [http://www.lua.org/manual/5.1/manual.html#pdf-package.seeall package.seeall] flag is strongly discouraged due to its various bad side-effects.
 
 It is also possible to directly require the packages in external Lua modules:
 
@@ -837,14 +1167,14 @@ It is also possible to directly require the packages in external Lua modules:
 
 The ability to require these packages was introduced in the <code>v0.2.1rc19</code> release.
 
-Network I/O operations in user code should only be done through the Nginx Lua API calls as the Nginx event loop may be blocked and performance drop off dramatically otherwise. Disk operations with relatively small amount of data can be done using the standard Lua <code>io</code> library but huge file reading and writing should be avoided wherever possible as they may block the Nginx process significantly. Delegating all network and disk I/O operations to Nginx's subrequests (via the [[#ngx.location.catpure|ngx.location.capture]] method and similar) is strongly recommended for maximum performance.
+Network I/O operations in user code should only be done through the Nginx Lua API calls as the Nginx event loop may be blocked and performance drop off dramatically otherwise. Disk operations with relatively small amount of data can be done using the standard Lua <code>io</code> library but huge file reading and writing should be avoided wherever possible as they may block the Nginx process significantly. Delegating all network and disk I/O operations to Nginx's subrequests (via the [[#ngx.location.capture|ngx.location.capture]] method and similar) is strongly recommended for maximum performance.
 
 == ngx.arg ==
 '''syntax:''' ''val = ngx.arg[index]''
 
-'''context:''' ''set_by_lua*''
+'''context:''' ''set_by_lua*, body_filter_by_lua*''
 
-Index the input arguments to the [[#set_by_lua|set_by_lua]] and [[#set_by_lua_file|set_by_lua_file]] directives:
+When this is used in the context of the [[#set_by_lua|set_by_lua]] or [[#set_by_lua_file|set_by_lua_file]] directives, this table is read-only and holds the input arguments to the config directives:
 
 <geshi lang="lua">
     value = ngx.arg[n]
@@ -867,10 +1197,14 @@ Here is an example
 
 that writes out <code>88</code>, the sum of <code>32</code> and <code>56</code>.
 
+When this table is used in the context of [[#body_filter_by_lua|body_filter_by_lua]] or [[#body_filter_by_lua_file|body_filter_by_lua_file]], the first element holds the input data chunk to the output filter code and the second element holds the boolean flag for the "eof" flag indicating the end of the whole output data stream.
+
+The data chunk and "eof" flag passed to the downstream Nginx output filters can also be overridden by assigning values directly to the corresponding table elements. When setting <code>nil</code> or an empty Lua string value to <code>ngx.arg[1]</code>, no data chunk will be passed to the downstream Nginx output filters at all.
+
 == ngx.var.VARIABLE ==
 '''syntax:''' ''ngx.var.VAR_NAME''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Read and write Nginx variable values.
 
@@ -906,8 +1240,17 @@ Setting <code>ngx.var.Foo</code> to a <code>nil</code> value will unset the <cod
     ngx.var.args = nil
 </geshi>
 
+'''WARNING''' When reading from an Nginx variable, Nginx will allocate memory in the per-request memory pool which is freed only at request termination. So when you need to read from an Nginx variable repeatedly in your Lua code, cache the Nginx variable value to your own Lua variable, for example,
+
+<geshi lang="lua">
+    local val = ngx.var.some_var
+    --- use the val repeatedly later
+</geshi>
+
+to prevent (temporary) memory leaking within the current request's lifetime.
+
 == Core constants ==
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, *log_by_lua*''
 
 <geshi lang="lua">
   ngx.OK (0)
@@ -923,12 +1266,12 @@ Note that only three of these constants are utilized by the [[#Nginx API for Lua
   ngx.null
 </geshi>
 
-The <code>ngx.null</code> constant is a <code>NULL</code> light userdata which is usually used to represent nil values in Lua tables and etc. It is identical with the [http://www.kyne.com.au/~mark/software/lua-cjson.php lua-cjson] library's <code>cjson.null</code> constant. This constant was first introduced in the <code>v0.5.0rc5</code> release.
+The <code>ngx.null</code> constant is a <code>NULL</code> light userdata usually used to represent nil values in Lua tables etc and is similar to the [http://www.kyne.com.au/~mark/software/lua-cjson.php lua-cjson] library's <code>cjson.null</code> constant. This constant was first introduced in the <code>v0.5.0rc5</code> release.
 
 The <code>ngx.DECLINED</code> constant was first introduced in the <code>v0.5.0rc19</code> release.
 
 == HTTP method constants ==
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 <geshi lang="text">
   ngx.HTTP_GET
@@ -942,7 +1285,7 @@ The <code>ngx.DECLINED</code> constant was first introduced in the <code>v0.5.0r
 These constants are usually used in [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]] method calls.
 
 == HTTP status constants ==
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 <geshi lang="nginx">
   value = ngx.HTTP_OK (200)
@@ -965,7 +1308,7 @@ These constants are usually used in [[#ngx.location.capture|ngx.location.capture
 </geshi>
 
 == Nginx log level constants ==
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 <geshi lang="lua">
   ngx.STDERR
@@ -984,7 +1327,7 @@ These constants are usually used by the [[#ngx.log|ngx.log]] method.
 == print ==
 '''syntax:''' ''print(...)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 Writes argument values into the nginx <code>error.log</code> file with the <code>ngx.NOTICE</code> log level.
 
@@ -996,10 +1339,10 @@ It is equivalent to
 
 Lua <code>nil</code> arguments are accepted and result in literal <code>"nil"</code> strings while Lua booleans result in literal <code>"true"</code> or <code>"false"</code> strings. And the <code>ngx.null</code> constant will yield the <code>"null"</code> string output.
 
-There is a hard-coded length limitation on the error messages in the Nginx core. It is <code>2048</code> bytes at most, including the trailing newlines and the leading timestamps. You can manually modify this limit by modifying the <code>NGX_MAX_ERROR_STR</code> macro definition in the <code>src/core/ngx_log.h</code> file in the Nginx source tree. If the message size exceeds this limit, the Nginx core will truncate the message text automatically.
+There is a hard coded <code>2048</code> byte limitation on error message lengths in the Nginx core. This limit includes trailing newlines and leading time stamps. If the message size exceeds this limit, Nginx will truncate the message text accordingly. This limit can be manually modified by editing the <code>NGX_MAX_ERROR_STR</code> macro definition in the <code>src/core/ngx_log.h</code> file in the Nginx source tree.
 
 == ngx.ctx ==
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 This table can be used to store per-request Lua context data and has a life time identical to the current request (as with the Nginx variables). 
 
@@ -1103,7 +1446,7 @@ Overriding <code>ngx.ctx</code> with a new Lua table is also supported, for exam
 Issue a synchronous but still non-blocking ''Nginx Subrequest'' using <code>uri</code>.
 
 Nginx's subrequests provide a powerful way to make non-blocking internal requests to other locations configured with disk file directory or ''any'' other nginx C modules like <code>ngx_proxy</code>, <code>ngx_fastcgi</code>, <code>ngx_memc</code>,
-<code>ngx_postgres</code>, <code>ngx_drizzle</code>, and even <code>ngx_lua</code> itself and etc etc etc.
+<code>ngx_postgres</code>, <code>ngx_drizzle</code>, and even ngx_lua itself and etc etc etc.
 
 Also note that subrequests just mimic the HTTP interface but there is ''no'' extra HTTP/TCP traffic ''nor'' IPC involved. Everything works internally, efficiently, on the C level.
 
@@ -1129,7 +1472,7 @@ lines:
     Set-Cookie: baz=blah
 </geshi>
 
-Then <code>res.header["Set-Cookie"]</code> will be evaluted to the table value
+Then <code>res.header["Set-Cookie"]</code> will be evaluated to the table value
 <code>{"a=3", "foo=bar", "baz=blah"}</code>.
 
 URI query strings can be concatenated to URI itself, for instance,
@@ -1186,8 +1529,8 @@ is equivalent to
     ngx.location.capture('/foo?a=1&b=3&c=%3a')
 </geshi>
 
-that is, this method will automatically escape argument keys and values according to URI rules and
-concatenating them together into a complete query string. The format for the Lua table passed as the <code>args</code> argument is identical to the format used in the [[#ngx.encode_args|ngx.encode_args]] method.
+that is, this method will escape argument keys and values according to URI rules and
+concatenate them together into a complete query string. The format for the Lua table passed as the <code>args</code> argument is identical to the format used in the [[#ngx.encode_args|ngx.encode_args]] method.
 
 The <code>args</code> option can also take plain query strings:
 
@@ -1208,20 +1551,20 @@ This option is set to <code>false</code> by default
 
 <geshi lang="nginx">
     location /other {
-        set $dog "$dog world";                  
-        echo "$uri dog: $dog";                    
-    }                                     
-    
+        set $dog "$dog world";
+        echo "$uri dog: $dog";
+    }
+
     location /lua {
         set $dog 'hello';
         content_by_lua '
             res = ngx.location.capture("/other",
                 { share_all_vars = true });
-                
+
             ngx.print(res.body)
             ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        ';  
-    }           
+        ';
+    }
 </geshi>
 
 Accessing location <code>/lua</code> gives
@@ -1298,25 +1641,25 @@ The <code>ctx</code> option can be used to specify a custom Lua table to serve a
 
 <geshi lang="nginx">
     location /sub {
-        content_by_lua '                          
-            ngx.ctx.foo = "bar";                  
+        content_by_lua '
+            ngx.ctx.foo = "bar";
         ';
-    }   
+    }
     location /lua {
         content_by_lua '
-            local ctx = {}                        
+            local ctx = {}
             res = ngx.location.capture("/sub", { ctx = ctx })
-            
+
             ngx.say(ctx.foo);
-            ngx.say(ngx.ctx.foo);                 
-        ';                                        
+            ngx.say(ngx.ctx.foo);
+        ';
     }
 </geshi>
 
 Then request <code>GET /lua</code> gives
 
 <geshi lang="text">
-    bar                                               
+    bar
     nil
 </geshi>
 
@@ -1349,13 +1692,15 @@ subrequests, an "Accept-Encoding: gzip" header in the main request may result
 in gzipped responses that cannot be handled properly in Lua code. Original request headers should be ignored by setting 
 [[HttpProxyModule#proxy_pass_request_headers|proxy_pass_request_headers]] to <code>off</code> in subrequest locations.
 
-There is a hard-coded upper limit on the number of concurrent subrequests every main request. In older versions of Nginx, the limit is <code>50</code>, which is then increased to <code>200</code> in recent Nginx <code>1.1.x</code> releases. You can manually edit this limit by modifying the definition of the <code>NGX_HTTP_MAX_SUBREQUESTS</code> macro in the <code>nginx/src/http/ngx_http_request.h</code> file in the Nginx source tree. When you are exceeding this limit, you will get the following error message in your <code>error.log</code> file:
+There is a hard-coded upper limit on the number of concurrent subrequests possible for every main request. In older versions of Nginx, the limit was <code>50</code> concurrent subrequests and in more recent versions, Nginx <code>1.1.x</code> onwards, this was increased to <code>200</code> concurrent subrequests. When this limit is exceeded, the following error message is added to the <code>error.log</code> file:
 
 <geshi lang="text">
     [error] 13983#0: *1 subrequests cycle while processing "/uri"
 </geshi>
 
-Please also refer to restrictions on [[#Locations_With_HttpEchoModule_Directives|capturing locations that include Echo Module directives]].
+The limit can be manually modified if required by editing the definition of the <code>NGX_HTTP_MAX_SUBREQUESTS</code> macro in the <code>nginx/src/http/ngx_http_request.h</code> file in the Nginx source tree.
+
+Please also refer to restrictions on capturing locations configured by [[#Locations_Configured_by_Subrequest_Directives_of_Other_Modules|subrequest directives of other modules]].
 
 == ngx.location.capture_multi ==
 '''syntax:''' ''res1, res2, ... = ngx.location.capture_multi({ {uri, options?}, {uri, options?}, ... })''
@@ -1414,10 +1759,10 @@ of this function. Logically speaking, the [[#ngx.location.capture|ngx.location.c
         end
 </geshi>
 
-Please also refer to restrictions on [[#Locations_With_HttpEchoModule_Directives|capturing locations that include Echo Module directives]].
+Please also refer to restrictions on capturing locations configured by [[#Locations_Configured_by_Subrequest_Directives_of_Other_Modules|subrequest directives of other modules]].
 
 == ngx.status ==
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 Read and write the current request's response status. This should be called
 before sending out the response headers.
@@ -1427,14 +1772,24 @@ before sending out the response headers.
     status = ngx.status
 </geshi>
 
+Setting <code>ngx.status</code> after the response header is sent out has no effect but leaving an error message in your nginx's error log file:
+
+<geshi lang="text">
+    attempt to set ngx.status after sending out response headers
+</geshi>
+
 == ngx.header.HEADER ==
 '''syntax:''' ''ngx.header.HEADER = VALUE''
 
 '''syntax:''' ''value = ngx.header.HEADER''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
-Set, add to, or clear the current request <code>HEADER</code> response header. Underscores (<code>_</code>) in the header names will be replaced by dashes (<code>-</code>) and the header names will be matched case-insensitively.
+Set, add to, or clear the current request's <code>HEADER</code> response header that is to be sent.
+
+Underscores (<code>_</code>) in the header names will be replaced by hyphens (<code>-</code>) by default. This transformation can be turned off via the [[#lua_transform_underscores_in_response_headers|lua_transform_underscores_in_response_headers]] directive.
+
+The header names are matched case-insensitively.
 
 <geshi lang="lua">
     -- equivalent to ngx.header["Content-Type"] = 'text/plain'
@@ -1525,10 +1880,53 @@ Note that <code>ngx.header</code> is not a normal Lua table and as such, it is n
 
 For reading ''request'' headers, use the [[#ngx.req.get_headers|ngx.req.get_headers]] function instead.
 
+== ngx.req.start_time ==
+'''syntax:''' ''secs = ngx.req.start_time()''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
+
+Returns a floating-point number representing the timestamp (including milliseconds as the decimal part) when the current request was created.
+
+The following example emulates the <code>$request_time</code> variable value (provided by [[HttpLogModule]]) in pure Lua:
+
+<geshi lang="lua">
+    local request_time = ngx.now() - ngx.req.start_time()
+</geshi>
+
+This function was first introduced in the <code>v0.7.7</code> release.
+
+See also [[#ngx.now|ngx.now]] and [[#ngx.update_time|ngx.update_time]].
+
+== ngx.req.get_method ==
+'''syntax:''' ''method_name = ngx.req.get_method()''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+
+Retrieves the current request's request method name. Strings like <code>"GET"</code> and <code>"POST"</code> are returned instead of numerical [[#HTTP method constants|method constants]].
+
+If the current request is an Nginx subrequest, then the subrequest's method name will be returned.
+
+This method was first introduced in the <code>v0.5.6</code> release.
+
+See also [[#ngx.req.set_method|ngx.req.set_method]].
+
+== ngx.req.set_method ==
+'''syntax:''' ''ngx.req.set_method(method_id)''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+
+Overrides the current request's request method with the <code>request_id</code> argument. Currently only numerical [[#HTTP method constants|method constants]] are supported, like <code>ngx.HTTP_POST</code> and <code>ngx.HTTP_GET</code>.
+
+If the current request is an Nginx subrequest, then the subrequest's method will be overridden.
+
+This method was first introduced in the <code>v0.5.6</code> release.
+
+See also [[#ngx.req.get_method|ngx.req.get_method]].
+
 == ngx.req.set_uri ==
 '''syntax:''' ''ngx.req.set_uri(uri, jump?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*''
 
 Rewrite the current request's (parsed) URI by the <code>uri</code> argument. The <code>uri</code> argument must be a Lua string and cannot be of zero length, or a Lua exception will be thrown.
 
@@ -1614,7 +2012,7 @@ This interface was first introduced in the <code>v0.3.1rc14</code> release.
 == ngx.req.set_uri_args ==
 '''syntax:''' ''ngx.req.set_uri_args(args)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*''
 
 Rewrite the current request's URI query arguments by the <code>args</code> argument. The <code>args</code> argument can be either a Lua string, as in
 
@@ -1628,7 +2026,7 @@ or a Lua table holding the query arguments' key-value pairs, as in
     ngx.req.set_uri_args({ a = 3, b = "hello world" })
 </geshi>
 
-where in the latter case, this method will automatically escape argument keys and values according to the URI escaping rule.
+where in the latter case, this method will escape argument keys and values according to the URI escaping rule.
 
 Multi-value arguments are also supported:
 
@@ -1636,7 +2034,7 @@ Multi-value arguments are also supported:
     ngx.req.set_uri_args({ a = 3, b = {5, 6} })
 </geshi>
 
-which will result in a querystring like <code>a=3&b=5&b=6</code>.
+which will result in a query string like <code>a=3&b=5&b=6</code>.
 
 This interface was first introduced in the <code>v0.3.1rc13</code> release.
 
@@ -1645,7 +2043,7 @@ See also [[#ngx.req.set_uri|ngx.req.set_uri]].
 == ngx.req.get_uri_args ==
 '''syntax:''' ''args = ngx.req.get_uri_args(max_args?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 Returns a Lua table holding all the current request URL query arguments.
 
@@ -1673,7 +2071,7 @@ Then <code>GET /test?foo=bar&bar=baz&bar=blah</code> will yield the response bod
 
 Multiple occurrences of an argument key will result in a table value holding all the values for that key in order.
 
-Keys and values are automatically unescaped according to URI escaping rules. In the settings above, <code>GET /test?a%20b=1%61+2</code> will yield:
+Keys and values are unescaped according to URI escaping rules. In the settings above, <code>GET /test?a%20b=1%61+2</code> will yield:
 
 <geshi lang="bash">
     a b: 1a 2
@@ -1729,7 +2127,7 @@ Removing the <code>max_args</code> cap is strongly discouraged.
 == ngx.req.get_post_args ==
 '''syntax:''' ''ngx.req.get_post_args(max_args?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 Returns a Lua table holding all the current request POST query arguments (of the MIME type <code>application/x-www-form-urlencoded</code>). Call [[#ngx.req.read_body|ngx.req.read_body]] to read the request body first or turn on the [[#lua_need_request_body|lua_need_request_body]] directive to avoid Lua exception errors.
 
@@ -1765,7 +2163,7 @@ will yield the response body like
 
 Multiple occurrences of an argument key will result in a table value holding all of the values for that key in order.
 
-Keys and values will be automatically unescaped according to URI escaping rules. 
+Keys and values will be unescaped according to URI escaping rules.
 
 With the settings above,
 
@@ -1813,9 +2211,9 @@ This argument can be set to zero to remove the limit and to process all request
 Removing the <code>max_args</code> cap is strongly discouraged.
 
 == ngx.req.get_headers ==
-'''syntax:''' ''headers = ngx.req.get_headers(max_headers?)''
+'''syntax:''' ''headers = ngx.req.get_headers(max_headers?, raw?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*''
 
 Returns a Lua table holding all the current request headers.
 
@@ -1864,13 +2262,26 @@ This argument can be set to zero to remove the limit and to process all request
 
 Removing the <code>max_headers</code> cap is strongly discouraged.
 
+Since the <code>0.6.9</code> release, all the header names in the Lua table returned are converted to the pure lower-case form by default, unless the <code>raw</code> argument is set to <code>true</code> (default to <code>false</code>).
+
+Also, by default, an <code>__index</code> metamethod is added to the resulting Lua table and will normalize the keys to a pure lowercase form with all underscores converted to dashes in case of a lookup miss. For example, if a request header <code>My-Foo-Header</code> is present, then the following invocations will all pick up the value of this header correctly:
+
+<geshi lang="lua">
+    ngx.say(headers.my_foo_header)
+    ngx.say(headers["My-Foo-Header"])
+    ngx.say(headers["my-foo-header"])
+</geshi>
+
+The <code>__index</code> metamethod will not be added when the <code>raw</code> argument is set to <code>true</code>.
+
 == ngx.req.set_header ==
 '''syntax:''' ''ngx.req.set_header(header_name, header_value)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua''
 
 Set the current request's request header named <code>header_name</code> to value <code>header_value</code>, overriding any existing ones.
-None of the current request's subrequests will be affected.
+
+By default, all the subrequests subsequently initiated by [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]] will inherit the new header.
 
 Here is an example of setting the <code>Content-Length</code> header:
 
@@ -1906,6 +2317,13 @@ is equivalent to
     ngx.req.clear_header("X-Foo")
 </geshi>
 
+== ngx.req.clear_header ==
+'''syntax:''' ''ngx.req.clear_header(header_name)''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*''
+
+Clear the current request's request header named <code>header_name</code>. None of the current request's subrequests will be affected.
+
 == ngx.req.read_body ==
 '''syntax:''' ''ngx.req.read_body()''
 
@@ -1960,7 +2378,7 @@ This function returns <code>nil</code> if
 # the request body has been read into disk temporary files,
 # or the request body has zero size.
 
-If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turned on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body automatically, but this is not recommended).
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turned on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however).
 
 If the request body has been read into disk files, try calling the [[#ngx.req.get_body_file|ngx.req.get_body_file]] function instead.
 
@@ -1979,9 +2397,9 @@ See also [[#ngx.req.get_body_file|ngx.req.get_body_file]].
 
 Retrieves the file name for the in-file request body data. Returns <code>nil</code> if the request body has not been read or has been read into memory.
 
-The returned file is read only and is usually cleaned up automatically by Nginx's memory pool. It should not be manually modified, renamed, or removed in Lua code.
+The returned file is read only and is usually cleaned up by Nginx's memory pool. It should not be manually modified, renamed, or removed in Lua code.
 
-If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turned on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body automatically, but this is not recommended).
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turned on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however).
 
 If the request body has been read into memory, try calling the [[#ngx.req.get_body_data|ngx.req.get_body_data]] function instead.
 
@@ -2015,7 +2433,7 @@ See also [[#ngx.req.set_body_file|ngx.req.set_body_file]].
 
 Set the current request's request body using the in-file data specified by the <code>file_name</code> argument.
 
-If the optional <code>auto_clean</code> argument is given a <code>true</code> value, then this file will be automatically removed at request completion or the next time this function or [[#ngx.req.set_body_data|ngx.req.set_body_data]] are called in the same request. The <code>auto_clean</code> is default to <code>false</code>.
+If the optional <code>auto_clean</code> argument is given a <code>true</code> value, then this file will be removed at request completion or the next time this function or [[#ngx.req.set_body_data|ngx.req.set_body_data]] are called in the same request. The <code>auto_clean</code> is default to <code>false</code>.
 
 Please ensure that the file specified by the <code>file_name</code> argument exists and is readable by an Nginx worker process by setting its permission properly to avoid Lua exception errors.
 
@@ -2028,6 +2446,63 @@ This function was first introduced in the <code>v0.3.1rc18</code> release.
 
 See also [[#ngx.req.set_body_data|ngx.req.set_body_data]].
 
+== ngx.req.init_body ==
+'''syntax:''' ''ngx.req.init_body(buffer_size?)''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Creates a new blank request body for the current request and inializes the buffer for later request body data writing via the [[#ngx.req.append_body|ngx.req.append_body]] and [[#ngx.req.finish_body|ngx.req.finish_body]] APIs.
+
+If the <code>buffer_size</code> argument is specified, then its value will be used for the size of the memory buffer for body writing with [[#ngx.req.append_body|ngx.req.append_body]]. If the argument is omitted, then the value specified by the standard [[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]] directive will be used instead.
+
+When the data can no longer be hold in the memory buffer for the request body, then the data will be flushed onto a temporary file just like the standard request body reader in the Nginx core.
+
+It is important to always call the [[#ngx.req.finish_body|ngx.req.finish_body]] after all the data has been appended onto the current request body. Also, when this function is used together with [[#ngx.req.socket|ngx.req.socket]], it is required to call [[#ngx.req.socket|ngx.req.socket]] ''before'' this function, or you will get the "request body already exists" error message.
+
+The usage of this function is often like this:
+
+<geshi lang="lua">
+    ngx.req.init_body(128 * 1024)  -- buffer is 128KB
+    for chunk in next_data_chunk() do
+        ngx.req.append_body(chunk) -- each chunk can be 4KB
+    end
+    ngx.req.finish_body()
+</geshi>
+
+This function can be used with [[#ngx.req.append_body|ngx.req.append_body]], [[#ngx.req.finish_body|ngx.req.finish_body]], and [[#ngx.req.socket|ngx.req.socket]] to implement efficient input filters in pure Lua (in the context of [[#rewrite_by_lua|rewrite_by_lua]]* or [[#access_by_lua|access_by_lua]]*), which can be used with other Nginx content handler or upstream modules like [[HttpProxyModule]] and [[HttpFastcgiModule]].
+
+This function was first introduced in the <code>v0.5.11</code> release.
+
+== ngx.req.append_body ==
+'''syntax:''' ''ngx.req.append_body(data_chunk)''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Append new data chunk specified by the <code>data_chunk</code> argument onto the existing request body created by the [[#ngx.req.init_body|ngx.req.init_body]] call.
+
+When the data can no longer be hold in the memory buffer for the request body, then the data will be flushed onto a temporary file just like the standard request body reader in the Nginx core.
+
+It is important to always call the [[#ngx.req.finish_body|ngx.req.finish_body]] after all the data has been appended onto the current request body.
+
+This function can be used with [[#ngx.req.init_body|ngx.req.init_body]], [[#ngx.req.finish_body|ngx.req.finish_body]], and [[#ngx.req.socket|ngx.req.socket]] to implement efficient input filters in pure Lua (in the context of [[#rewrite_by_lua|rewrite_by_lua]]* or [[#access_by_lua|access_by_lua]]*), which can be used with other Nginx content handler or upstream modules like [[HttpProxyModule]] and [[HttpFastcgiModule]].
+
+This function was first introduced in the <code>v0.5.11</code> release.
+
+See also [[#ngx.req.init_body|ngx.req.init_body]].
+
+== ngx.req.finish_body ==
+'''syntax:''' ''ngx.req.finish_body()''
+
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Completes the construction process of the new request body created by the [[#ngx.req.init_body|ngx.req.init_body]] and [[#ngx.req.append_body|ngx.req.append_body]] calls.
+
+This function can be used with [[#ngx.req.init_body|ngx.req.init_body]], [[#ngx.req.append_body|ngx.req.append_body]], and [[#ngx.req.socket|ngx.req.socket]] to implement efficient input filters in pure Lua (in the context of [[#rewrite_by_lua|rewrite_by_lua]]* or [[#access_by_lua|access_by_lua]]*), which can be used with other Nginx content handler or upstream modules like [[HttpProxyModule]] and [[HttpFastcgiModule]].
+
+This function was first introduced in the <code>v0.5.11</code> release.
+
+See also [[#ngx.req.init_body|ngx.req.init_body]].
+
 == ngx.req.socket ==
 '''syntax:''' ''tcpsock, err = ngx.req.socket()''
 
@@ -2039,17 +2514,10 @@ In case of error, <code>nil</code> will be returned as well as a string describi
 
 The socket object returned by this method is usually used to read the current request's body in a streaming fashion. Do not turn on the [[#lua_need_request_body|lua_need_request_body]] directive, and do not mix this call with [[#ngx.req.read_body|ngx.req.read_body]] and [[#ngx.req.discard_body|ngx.req.discard_body]].
 
-If there is any request body data that has been preread into the Nginx core's request header buffer, the resulting cosocket object will take care of that automatically. So there will not be any data loss due to potential body data prereading.
+If any request body data has been pre-read into the Nginx core request header buffer, the resulting cosocket object will take care of this to avoid potential data loss resulting from such pre-reading.
 
 This function was first introduced in the <code>v0.5.0rc1</code> release.
 
-== ngx.req.clear_header ==
-'''syntax:''' ''ngx.req.clear_header(header_name)''
-
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
-
-Clear the current request's request header named <code>header_name</code>. None of the current request's subrequests will be affected.
-
 == ngx.exec ==
 '''syntax:''' ''ngx.exec(uri, args?)''
 
@@ -2083,7 +2551,7 @@ The optional second <code>args</code> can be used to specify extra URI query arg
     ngx.exec("/foo", "a=3&b=hello%20world")
 </geshi>
 
-Alternatively, a Lua table can be passed for the <code>args</code> argument for ngx_lua to carry out URI escaping and string concatenation automatically.
+Alternatively, a Lua table can be passed for the <code>args</code> argument for ngx_lua to carry out URI escaping and string concatenation.
 
 <geshi lang="lua">
     ngx.exec("/foo", { a = 3, b = "hello world" })
@@ -2099,7 +2567,7 @@ This method never returns.
 This method ''must'' be called before [[#ngx.send_headers|ngx.send_headers]] or explicit response body
 outputs by either [[#ngx.print|ngx.print]] or [[#ngx.say|ngx.say]].
 
-It's strongly recommended to combine the <code>return</code> statement with this call, i.e., <code>return ngx.exec(...)</code>.
+It is strongly recommended to combine the <code>return</code> statement with this call, i.e., <code>return ngx.exec(...)</code>.
 
 This method is similar to the [[HttpEchoModule#echo_exec|echo_exec]] directive of the [[HttpEchoModule]].
 
@@ -2125,7 +2593,7 @@ which is equivalent to
     return ngx.redirect("http://localhost:1984/foo", ngx.HTTP_MOVED_TEMPORARILY)
 </geshi>
 
-We can also use the numberical code directly as the second <code>status</code> argument:
+We can also use the numerical code directly as the second <code>status</code> argument:
 
 <geshi lang="lua">
     return ngx.redirect("/foo", 301)
@@ -2133,8 +2601,6 @@ We can also use the numberical code directly as the second <code>status</code> a
 
 This method ''must'' be called before [[#ngx.send_headers|ngx.send_headers]] or explicit response body outputs by either [[#ngx.print|ngx.print]] or [[#ngx.say|ngx.say]].
 
-This method never returns.
-
 This method is very much like the [[HttpRewriteModule#rewrite|rewrite]] directive with the <code>redirect</code> modifier in the standard
 [[HttpRewriteModule]], for example, this <code>nginx.conf</code> snippet
 
@@ -2166,7 +2632,7 @@ URI arguments can be specified as well, for example:
     return ngx.redirect('/foo?a=3&b=4')
 </geshi>
 
-It's strongly recommended to combine the <code>return</code> statement with this call, i.e., <code>return ngx.redirect(...)</code>.
+This method call terminates the current request's processing and never returns. It is recommended to combine the <code>return</code> statement with this call, i.e., <code>return ngx.redirect(...)</code>, so as to be more explicit.
 
 == ngx.send_headers ==
 '''syntax:''' ''ngx.send_headers()''
@@ -2175,13 +2641,13 @@ It's strongly recommended to combine the <code>return</code> statement with this
 
 Explicitly send out the response headers.
 
-Note that there is normally no need to manually send out response headers as <code>ngx_lua</code> will automatically send headers out 
+Note that there is normally no need to manually send out response headers as ngx_lua will automatically send headers out
 before content is output with [[#ngx.say|ngx.say]] or [[#ngx.print|ngx.print]] or when [[#content_by_lua|content_by_lua]] exits normally.
 
 == ngx.headers_sent ==
 '''syntax:''' ''value = ngx.headers_sent''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
 Returns <code>true</code> if the response headers have been sent (by ngx_lua), and <code>false</code> otherwise.
 
@@ -2229,7 +2695,7 @@ Just as [[#ngx.print|ngx.print]] but also emit a trailing newline.
 == ngx.log ==
 '''syntax:''' ''ngx.log(log_level, ...)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Log arguments concatenated to error.log with the given logging level.
 
@@ -2237,7 +2703,7 @@ Lua <code>nil</code> arguments are accepted and result in literal <code>"nil"</c
 
 The <code>log_level</code> argument can take constants like <code>ngx.ERR</code> and <code>ngx.WARN</code>. Check out [[#Nginx log level constants|Nginx log level constants]] for details.
 
-There is a hard-coded length limitation on the error messages in the Nginx core. It is <code>2048</code> bytes at most, including the trailing newlines and the leading timestamps. You can manually modify this limit by modifying the <code>NGX_MAX_ERROR_STR</code> macro definition in the <code>src/core/ngx_log.h</code> file in the Nginx source tree. If the message size exceeds this limit, the Nginx core will truncate the message text automatically.
+There is a hard coded <code>2048</code> byte limitation on error message lengths in the Nginx core. This limit includes trailing newlines and leading time stamps. If the message size exceeds this limit, Nginx will truncate the message text accordingly. This limit can be manually modified by editing the <code>NGX_MAX_ERROR_STR</code> macro definition in the <code>src/core/ngx_log.h</code> file in the Nginx source tree.
 
 == ngx.flush ==
 '''syntax:''' ''ngx.flush(wait?)''
@@ -2297,26 +2763,56 @@ Number literals can be used directly as the argument, for instance,
 
 Note that while this method accepts all [[#HTTP status constants|HTTP status constants]] as input, it only accepts <code>NGX_OK</code> and <code>NGX_ERROR</code> of the [[#core constants|core constants]].
 
-It's strongly recommended to combine the <code>return</code> statement with this call, i.e., <code>return ngx.exit(...)</code>.
+It is recommended, though not necessary, to combine the <code>return</code> statement with this call, i.e., <code>return ngx.exit(...)</code>, to give a visual hint to others reading the code.
 
 == ngx.eof ==
 '''syntax:''' ''ngx.eof()''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Explicitly specify the end of the response output stream.
+Explicitly specify the end of the response output stream. In the case of HTTP 1.1 chunked encoded output, it will just trigger the Nginx core to send out the "last chunk".
+
+When you disable the HTTP 1.1 keep-alive feature for your downstream connections, you can rely on descent HTTP clients to close the connection actively for you when you call this method. This trick can be used do back-ground jobs without letting the HTTP clients to wait on the connection, as in the following example:
+
+<geshi lang="nginx">
+    location = /async {
+        keepalive_timeout 0;
+        content_by_lua '
+            ngx.say("got the task!")
+            ngx.eof()  -- descent HTTP client will close the connection at this point
+            -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
+        ';
+    }
+</geshi>
+
+But if you create subrequests to access other locations configured by Nginx upstream modules, then you should configure those upstream modules to ignore client connection abortions if they are not by default. For example, by default the standard [[HttpProxyModule]] will terminate both the subrequest and the main request as soon as the client closes the connection, so it is important to turn on the [[HttpProxyModule#proxy_ignore_client_abort|proxy_ignore_client_abort]] directive in your location block configured by [[HttpProxyModule]]:
+
+<geshi lang="nginx">
+    proxy_ignore_client_abort on;
+</geshi>
+
+== ngx.sleep ==
+'''syntax:''' ''ngx.sleep(seconds)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Sleeps for the specified seconds without blocking. One can specify time resolution up to 0.001 seconds (i.e., one milliseconds).
+
+Behind the scene, this method makes use of the Nginx timers.
+
+This method was introduced in the <code>0.5.0rc30</code> release.
 
 == ngx.escape_uri ==
 '''syntax:''' ''newstr = ngx.escape_uri(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Escape <code>str</code> as a URI component.
 
 == ngx.unescape_uri ==
 '''syntax:''' ''newstr = ngx.unescape_uri(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Unescape <code>str</code> as an escaped URI component.
 
@@ -2335,7 +2831,7 @@ gives the output
 == ngx.encode_args ==
 '''syntax:''' ''str = ngx.encode_args(table)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Encode the Lua table to a query args string according to the URI encoded rules.
 
@@ -2353,7 +2849,7 @@ yields
 
 The table keys must be Lua strings.
 
-Multi-value query args are also supported. Just use a Lua table for the arg's value, for example:
+Multi-value query args are also supported. Just use a Lua table for the argument's value, for example:
 
 <geshi lang="lua">
     ngx.encode_args({baz = {32, "hello"}})
@@ -2386,11 +2882,11 @@ This method was first introduced in the <code>v0.3.1rc27</code> release.
 == ngx.decode_args ==
 '''syntax:''' ''table = ngx.decode_args(str, max_args?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [[#ngx.encode_args|ngx.encode_args]].
 
-The optional <code>max_args</code> argument can be used to specify the maximalnumber of arguments parsed from the <code>str</code> argument. By default, a maximum of 100 request arguments are parsed (including those with the same name) and that additional URI arguments are silently discarded to guard against potential denial of service attacks.
+The optional <code>max_args</code> argument can be used to specify the maximum number of arguments parsed from the <code>str</code> argument. By default, a maximum of 100 request arguments are parsed (including those with the same name) and that additional URI arguments are silently discarded to guard against potential denial of service attacks.
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
@@ -2405,21 +2901,21 @@ This method was introduced in the <code>v0.5.0rc29</code>.
 == ngx.encode_base64 ==
 '''syntax:''' ''newstr = ngx.encode_base64(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Encode <code>str</code> to a base64 digest.
 
 == ngx.decode_base64 ==
 '''syntax:''' ''newstr = ngx.decode_base64(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Decodes the <code>str</code> argument as a base64 digest to the raw form. Returns <code>nil</code> if <code>str</code> is not well formed.
 
 == ngx.crc32_short ==
 '''syntax:''' ''intval = ngx.crc32_short(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
 
@@ -2432,7 +2928,7 @@ This API was first introduced in the <code>v0.3.1rc8</code> release.
 == ngx.crc32_long ==
 '''syntax:''' ''intval = ngx.crc32_long(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
 
@@ -2445,7 +2941,7 @@ This API was first introduced in the <code>v0.3.1rc8</code> release.
 == ngx.hmac_sha1 ==
 '''syntax:''' ''digest = ngx.hmac_sha1(secret_key, str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Computes the [http://en.wikipedia.org/wiki/HMAC HMAC-SHA1] digest of the argument <code>str</code> and turns the result using the secret key <code><secret_key></code>.
 
@@ -2466,14 +2962,14 @@ yields the output
     R/pvxzHC4NLtj7S+kXFg/NePTmk=
 </geshi>
 
-This API requires the OpenSSL library enabled in the Nignx build (usually by passing the <code>--with-http_ssl_module</code> option to the <code>./configure</code> script).
+This API requires the OpenSSL library enabled in the Nginx build (usually by passing the <code>--with-http_ssl_module</code> option to the <code>./configure</code> script).
 
 This function was first introduced in the <code>v0.3.1rc29</code> release.
 
 == ngx.md5 ==
 '''syntax:''' ''digest = ngx.md5(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Returns the hexadecimal representation of the MD5 digest of the <code>str</code> argument.
 
@@ -2496,7 +2992,7 @@ See [[#ngx.md5_bin|ngx.md5_bin]] if the raw binary MD5 digest is required.
 == ngx.md5_bin ==
 '''syntax:''' ''digest = ngx.md5_bin(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Returns the binary form of the MD5 digest of the <code>str</code> argument.
 
@@ -2505,18 +3001,18 @@ See [[#ngx.md5|ngx.md5]] if the hexadecimal form of the MD5 digest is required.
 == ngx.sha1_bin ==
 '''syntax:''' ''digest = ngx.sha1_bin(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Returns the binary form of the SHA-1 digest of the <code>str</code> argument.
 
-This function requires enabling SHA-1 support in your Nginx build (usually you just need to install OpenSSL to your system while building Nginx).
+This function requires SHA-1 support in the Nginx build. (This usually just means OpenSSL should be installed while building Nginx).
 
 This function was first introduced in the <code>v0.5.0rc6</code>.
 
 == ngx.today ==
 '''syntax:''' ''str = ngx.today()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Returns current date (in the format <code>yyyy-mm-dd</code>) from the nginx cached time (no syscall involved unlike Lua's date library).
 
@@ -2525,27 +3021,27 @@ This is the local time.
 == ngx.time ==
 '''syntax:''' ''secs = ngx.time()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Returns the elapsed seconds from the epoch for the current timestamp from the nginx cached time (no syscall involved unlike Lua's date library).
+Returns the elapsed seconds from the epoch for the current time stamp from the nginx cached time (no syscall involved unlike Lua's date library).
 
 Updates of the Nginx time cache an be forced by calling [[#ngx.update_time|ngx.update_time]] first.
 
 == ngx.now ==
 '''syntax:''' ''secs = ngx.now()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Returns a floating-point number for the elapsed time in seconds (including microseconds as the decimal part) from the epoch for the current timestamp from the nginx cached time (no syscall involved unlike Lua's date library).
+Returns a floating-point number for the elapsed time in seconds (including milliseconds as the decimal part) from the epoch for the current time stamp from the nginx cached time (no syscall involved unlike Lua's date library).
 
-Use the Nginx core [[CoreModule#timer_resolution|timer_resolution]] directive to adjust the accuracy or forcibly update the Nginx time cache by calling [[#ngx.update_time|ngx.update_time]] first.
+You can forcibly update the Nginx time cache by calling [[#ngx.update_time|ngx.update_time]] first.
 
 This API was first introduced in <code>v0.3.1rc32</code>.
 
 == ngx.update_time ==
 '''syntax:''' ''ngx.update_time()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -2554,27 +3050,27 @@ This API was first introduced in <code>v0.3.1rc32</code>.
 == ngx.localtime ==
 '''syntax:''' ''str = ngx.localtime()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Returns the current timestamp (in the format <code>yyyy-mm-dd hh:mm:ss</code>) of the nginx cached time (no syscall involved unlike Lua's [http://www.lua.org/manual/5.1/manual.html#pdf-os.date os.date] function).
+Returns the current time stamp (in the format <code>yyyy-mm-dd hh:mm:ss</code>) of the nginx cached time (no syscall involved unlike Lua's [http://www.lua.org/manual/5.1/manual.html#pdf-os.date os.date] function).
 
 This is the local time.
 
 == ngx.utctime ==
 '''syntax:''' ''str = ngx.utctime()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Returns the current timestamp (in the format <code>yyyy-mm-dd hh:mm:ss</code>) of the nginx cached time (no syscall involved unlike Lua's [http://www.lua.org/manual/5.1/manual.html#pdf-os.date os.date] function).
+Returns the current time stamp (in the format <code>yyyy-mm-dd hh:mm:ss</code>) of the nginx cached time (no syscall involved unlike Lua's [http://www.lua.org/manual/5.1/manual.html#pdf-os.date os.date] function).
 
 This is the UTC time.
 
 == ngx.cookie_time ==
 '''syntax:''' ''str = ngx.cookie_time(sec)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Returns a formated string can be used as the cookie expiration time. The parameter <code>sec</code> is the timestamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
+Returns a formated string can be used as the cookie expiration time. The parameter <code>sec</code> is the time stamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
 
 <geshi lang="nginx">
     ngx.say(ngx.cookie_time(1290079655))
@@ -2584,9 +3080,9 @@ Returns a formated string can be used as the cookie expiration time. The paramet
 == ngx.http_time ==
 '''syntax:''' ''str = ngx.http_time(sec)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Returns a formated string can be used as the http header time (for example, being used in <code>Last-Modified</code> header). The parameter <code>sec</code> is the timestamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
+Returns a formated string can be used as the http header time (for example, being used in <code>Last-Modified</code> header). The parameter <code>sec</code> is the time stamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
 
 <geshi lang="nginx">
     ngx.say(ngx.http_time(1290079655))
@@ -2596,7 +3092,7 @@ Returns a formated string can be used as the http header time (for example, bein
 == ngx.parse_http_time ==
 '''syntax:''' ''sec = ngx.parse_http_time(str)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Parse the http time string (as returned by [[#ngx.http_time|ngx.http_time]]) into seconds. Returns the seconds or <code>nil</code> if the input string is in bad forms.
 
@@ -2610,20 +3106,20 @@ Parse the http time string (as returned by [[#ngx.http_time|ngx.http_time]]) int
 == ngx.is_subrequest ==
 '''syntax:''' ''value = ngx.is_subrequest''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Returns <code>true</code> if the current request is an nginx subrequest, or <code>false</code> otherwise.
 
 == ngx.re.match ==
 '''syntax:''' ''captures = ngx.re.match(subject, regex, options?, ctx?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Matches the <code>subject</code> string using the Perl-compatible regular expression <code>regex</code> with the optional <code>options</code>.
+Matches the <code>subject</code> string using the Perl compatible regular expression <code>regex</code> with the optional <code>options</code>.
 
 Only the first occurrence of the match is returned, or <code>nil</code> if no match is found. In case of fatal errors, like seeing bad <code>UTF-8</code> sequences in <code>UTF-8</code> mode, a Lua exception will be raised.
 
-When a match is found, a Lua table <code>captures</code> is returned, where <code>captures[0]</code> holds the whole substring being matched, and <code>captures[1]</code> holds the first parenthesized subpattern's capturing, <code>captures[2]</code> the second, and so on.
+When a match is found, a Lua table <code>captures</code> is returned, where <code>captures[0]</code> holds the whole substring being matched, and <code>captures[1]</code> holds the first parenthesized sub-pattern's capturing, <code>captures[2]</code> the second, and so on.
 
 <geshi lang="lua">
     local m = ngx.re.match("hello, 1234", "[0-9]+")
@@ -2636,7 +3132,7 @@ When a match is found, a Lua table <code>captures</code> is returned, where <cod
     -- m[1] == "1"
 </geshi>
 
-Unmatched subpatterns will have <code>nil</code> values in their <code>captures</code> table fields.
+Unmatched sub-patterns will have <code>nil</code> values in their <code>captures</code> table fields.
 
 <geshi lang="lua">
     local m = ngx.re.match("hello, world", "(world)|(hello)")
@@ -2654,17 +3150,16 @@ Specify <code>options</code> to control how the match operation will be performe
                   this requires PCRE 6.0+ or else a Lua exception will be thrown.
                   first introduced in ngx_lua v0.3.1rc30.
 
-    i             caseless mode (similar to Perl's /i modifier)
+    i             case insensitive mode (similar to Perl's /i modifier)
 
     j             enable PCRE JIT compilation, this requires PCRE 8.21+ which
-                  must be built with the --enable-jit option.
-                  for optimum performance, this option should always be used  
-                  together with the 'o' option.
+                  must be built with the --enable-jit option. for optimum performance,
+                  this option should always be used together with the 'o' option.
                   first introduced in ngx_lua v0.3.1rc30.
 
     m             multi-line mode (similar to Perl's /m modifier)
 
-    o             compile-once mode (similar to Perl's /o modifer),
+    o             compile-once mode (similar to Perl's /o modifier),
                   to enable the worker-process-level compiled-regex cache
 
     s             single-line mode (similar to Perl's /s modifier)
@@ -2712,7 +3207,7 @@ Note that, the <code>options</code> argument is not optional when the <code>ctx<
 
 This method requires the PCRE library enabled in Nginx.  ([[#Special PCRE Sequences|Known Issue With Special PCRE Sequences]]).
 
-To confirm that PCRE JIT is indeed enabled, it's required to enable the debugging logs in your Nginx build (by passing the <code>--with-debug</code> option to your Nginx or ngx_openresty's <code>./configure</code> script) and enable the "debug" error log level in your <code>error_log</code> directive, and then you can see the following message if PCRE JIT actually works:
+To confirm that PCRE JIT is enabled, activate the Nginx debug log by adding the <code>--with-debug</code> option to Nginx or ngx_openresty's <code>./configure</code> script. Then, enable the "debug" error log level in <code>error_log</code> directive. The following message will be generated if PCRE JIT is enabled:
 
 <geshi lang="text">
     pcre JIT compiling result: 1
@@ -2723,11 +3218,11 @@ This feature was introduced in the <code>v0.2.1rc11</code> release.
 == ngx.re.gmatch ==
 '''syntax:''' ''iterator = ngx.re.gmatch(subject, regex, options?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Similar to [[#ngx.re.match|ngx.re.match]], but returns a Lua iterator instead, so as to let the user programmer iterate all the matches over the <code><subject></code> string argument with the PCRE <code>regex</code>.
 
-Here is a small exmple to demonstrate its basic usage:
+Here is a small example to demonstrate its basic usage:
 
 <geshi lang="lua">
     local iterator = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
@@ -2757,9 +3252,9 @@ This feature was first introduced in the <code>v0.2.1rc12</code> release.
 == ngx.re.sub ==
 '''syntax:''' ''newstr, n = ngx.re.sub(subject, regex, replace, options?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
-Substitutes the first match of the Perl-compatible regular expression <code>regex</code> on the <code>subject</code> argument string with the string or function argument <code>replace</code>. The optional <code>options</code> argument has exactly the same meaning as in [[#ngx.re.match|ngx.re.match]].
+Substitutes the first match of the Perl compatible regular expression <code>regex</code> on the <code>subject</code> argument string with the string or function argument <code>replace</code>. The optional <code>options</code> argument has exactly the same meaning as in [[#ngx.re.match|ngx.re.match]].
 
 This method returns the resulting new string as well as the number of successful substitutions, or throw out a Lua exception when an error occurred (syntax errors in the <code><replace></code> string argument, for example).
 
@@ -2811,7 +3306,7 @@ This feature was first introduced in the <code>v0.2.1rc13</code> release.
 == ngx.re.gsub ==
 '''syntax:''' ''newstr, n = ngx.re.gsub(subject, regex, replace, options?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Just like [[#ngx.re.sub|ngx.re.sub]], but does global substitution.
 
@@ -2839,7 +3334,7 @@ This feature was first introduced in the <code>v0.2.1rc15</code> release.
 == ngx.shared.DICT ==
 '''syntax:''' ''dict = ngx.shared.DICT''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Fetching the shm-based Lua dictionary object for the shared memory zone named <code>DICT</code> defined by the [[#lua_shared_dict|lua_shared_dict]] directive.
 
@@ -2852,6 +3347,7 @@ The resulting object <code>dict</code> has the following methods:
 * [[#ngx.shared.DICT.incr|incr]]
 * [[#ngx.shared.DICT.delete|delete]]
 * [[#ngx.shared.DICT.flush_all|flush_all]]
+* [[#ngx.shared.DICT.flush_expired|flush_expired]]
 
 Here is an example:
 
@@ -2900,7 +3396,7 @@ This feature was first introduced in the <code>v0.3.1rc22</code> release.
 == ngx.shared.DICT.get ==
 '''syntax:''' ''value, flags = ngx.shared.DICT:get(key)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Retrieving the value in the dictionary [[#ngx.shared.DICT|ngx.shared.DICT]] for the key <code>key</code>. If the key does not exist or has been expired, then <code>nil</code> will be returned.
 
@@ -2931,7 +3427,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.set ==
 '''syntax:''' ''success, err, forcible = ngx.shared.DICT:set(key, value, exptime?, flags?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Unconditionally sets a key-value pair into the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns three values:
 
@@ -2967,12 +3463,14 @@ These two forms are fundamentally equivalent.
 
 This feature was first introduced in the <code>v0.3.1rc22</code> release.
 
+Please note that while internally the key-value pair is set atomically, the atomicity does not go across the method call boundary.
+
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 == ngx.shared.DICT.add ==
 '''syntax:''' ''success, err, forcible = ngx.shared.DICT:add(key, value, exptime?, flags?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Just like the [[#ngx.shared.DICT.set|set]] method, but only stores the key-value pair into the dictionary [[#ngx.shared.DICT|ngx.shared.DICT]] if the key does ''not'' exist.
 
@@ -2985,7 +3483,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.replace ==
 '''syntax:''' ''success, err, forcible = ngx.shared.DICT:replace(key, value, exptime?, flags?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Just like the [[#ngx.shared.DICT.set|set]] method, but only stores the key-value pair into the dictionary [[#ngx.shared.DICT|ngx.shared.DICT]] if the key ''does'' exist.
 
@@ -2998,7 +3496,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.delete ==
 '''syntax:''' ''ngx.shared.DICT:delete(key)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Unconditionally removes the key-value pair from the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
 
@@ -3011,7 +3509,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.incr ==
 '''syntax:''' ''newval, err = ngx.shared.DICT:incr(key, value)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Increments the (numerical) value for <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]] by the step value <code>value</code>. Returns the new resulting number if the operation is successfully completed or <code>nil</code> and an error message otherwise.
 
@@ -3028,20 +3526,184 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.flush_all ==
 '''syntax:''' ''ngx.shared.DICT:flush_all()''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 Flushes out all the items in the dictionary.
 
 This feature was first introduced in the <code>v0.5.0rc17</code> release.
 
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.flush_expired ==
+'''syntax:''' ''flushed = ngx.shared.DICT:flush_expired(max_count?)''
+
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
+
+Flushes out the expired items in the dictionary, up to the maximal number specified by the optional <code>max_count</code> argument. When the <code>max_count</code> argument is given <code>0</code> or not given at all, then it means unlimited. Returns the number of items that have actually been flushed.
+
+This feature was first introduced in the <code>v0.6.3</code> release.
+
+See also [[#ngx.shared.DICT.flush_all|ngx.shared.DICT.flush_all]] and [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.get_keys ==
+'''syntax:''' ''keys = ngx.shared.DICT:get_keys(max_count?)''
+
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
+
+Fetch a list of the keys from the dictionary, up to <code><max_count></code>.
+
+By default, only the first 1024 keys (if any) are returned. When the <code><max_count></code> argument is given the value <code>0</code>, then all the keys will be returned even there is more than 1024 keys in the dictionary.
+
+'''WARNING''' Be careful when calling this method on dictionaries with a really huge number of keys. This method may lock the dictionary for quite a while and block all the nginx worker processes that are trying to access the dictionary.
+
+This feature was first introduced in the <code>v0.7.3</code> release.
+
+== ngx.socket.udp ==
+'''syntax:''' ''udpsock = ngx.socket.udp()''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Creates and returns a UDP or datagram-oriented unix domain socket object (also known as one type of the "cosocket" objects). The following methods are supported on this object:
+
+* [[#udpsock:setpeername|setpeername]]
+* [[#udpsock:send|send]]
+* [[#udpsock:receive|receive]]
+* [[#udpsock:close|close]]
+* [[#udpsock:settimeout|settimeout]]
+
+It is intended to be compatible with the UDP API of the [http://w3.impa.br/~diego/software/luasocket/udp.html LuaSocket] library but is 100% nonblocking out of the box.
+
+This feature was first introduced in the <code>v0.5.7</code> release.
+
+See also [[#ngx.socket.tcp|ngx.socket.tcp]].
+
+== udpsock:setpeername ==
+'''syntax:''' ''ok, err = udpsock:setpeername(host, port)''
+
+'''syntax:''' ''ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Attempts to connect a UDP socket object to a remote server or to a datagram unix domain socket file. Because the datagram protocol is actually connection-less, this method does not really establish a "connection", but only just set the name of the remote peer for subsequent read/write operations.
+
+Both IP addresses and domain names can be specified as the <code>host</code> argument. In case of domain names, this method will use Nginx core's dynamic resolver to parse the domain name without blocking and it is required to configure the [[HttpCoreModule#resolver|resolver]] directive in the <code>nginx.conf</code> file like this:
+
+<geshi lang="nginx">
+    resolver 8.8.8.8;  # use Google's public DNS nameserver
+</geshi>
+
+If the nameserver returns multiple IP addresses for the host name, this method will pick up one randomly.
+
+In case of error, the method returns <code>nil</code> followed by a string describing the error. In case of success, the method returns <code>1</code>.
+
+Here is an example for connecting to a UDP (memcached) server:
+
+<geshi lang="nginx">
+    location /test {
+        resolver 8.8.8.8;
+
+        content_by_lua '
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("my.memcached.server.domain", 11211)
+            if not ok then
+                ngx.say("failed to connect to memcached: ", err)
+                return
+            end
+            ngx.say("successfully connected to memcached!")
+            sock:close()
+        ';
+    }
+</geshi>
+
+Connecting to a datagram unix domain socket file is also possible:
+
+<geshi lang="lua">
+    local sock = ngx.socket.udp()
+    local ok, err = sock:setpeername("unix:/tmp/some-datagram-service.sock")
+    if not ok then
+        ngx.say("failed to connect to the datagram unix domain socket: ", err)
+        return
+    end
+</geshi>
+
+assuming the datagram service is listening on the unix domain socket file <code>/tmp/some-datagram-service.sock</code>.
+
+Calling this method on an already connected socket object will cause the original connection to be closed first.
+
+This method was first introduced in the <code>v0.5.7</code> release.
+
+== udpsock:send ==
+'''syntax:''' ''ok, err = udpsock:send(data)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Sends data on the current UDP or datagram unix domain socket object.
+
+In case of success, it returns <code>1</code>. Otherwise, it returns <code>nil</code> and a string describing the error.
+
+The input argument <code>data</code> can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
+
+This feature was first introduced in the <code>v0.5.7</code> release.
+
+== udpsock:receive ==
+'''syntax:''' ''data, err = udpsock:receive(size?)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Receives data from the UDP or datagram unix domain socket object with an optional receive buffer size argument, <code>size</code>.
+
+This method is a synchronous operation and is 100% nonblocking.
+
+In case of success, it returns the data received; in case of error, it returns <code>nil</code> with a string describing the error.
+
+If the <code>size</code> argument is specified, then this method will use this size as the receive buffer size. But when this size is greater than <code>8192</code>, then <code>8192</code> will be used instead.
+
+If no argument is specified, then the maximal buffer size, <code>8192</code> is assumed.
+
+Timeout for the reading operation is controlled by the [[#lua_socket_read_timeout|lua_socket_read_timeout]] config directive and the [[#udpsock:settimeout|settimeout]] method. And the latter takes priority. For example:
+
+<geshi lang="lua">
+    sock:settimeout(1000)  -- one second timeout
+    local data, err = sock:receive()
+    if not data then
+        ngx.say("failed to read a packet: ", data)
+        return
+    end
+    ngx.say("successfully read a packet: ", data)
+</geshi>
+
+It is important here to call the [[#udpsock:settimeout|settimeout]] method ''before'' calling this method.
+
+This feature was first introduced in the <code>v0.5.7</code> release.
+
+== udpsock:close ==
+'''syntax:''' ''ok, err = udpsock:close()''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Closes the current UDP or datagram unix domain socket. It returns the <code>1</code> in case of success and returns <code>nil</code> with a string describing the error otherwise.
+
+Socket objects that have not invoked this method (and associated connections) will be closed when the socket object is released by the Lua GC (Garbage Collector) or the current client HTTP request finishes processing.
+
+This feature was first introduced in the <code>v0.5.7</code> release.
+
+== udpsock:settimeout ==
+'''syntax:''' ''udpsock:settimeout(time)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Set the timeout value in milliseconds for subsequent socket operations (like [[#udpsock:receive|receive]]).
+
+Settings done by this method takes priority over those config directives, like [[#lua_socket_read_timeout|lua_socket_read_timeout]].
+
+This feature was first introduced in the <code>v0.5.7</code> release.
 
 == ngx.socket.tcp ==
 '''syntax:''' ''tcpsock = ngx.socket.tcp()''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Creates and returns a TCP (or Unix Domain) socket object (also known as the "cosocket" object). The following methods are supported on this object:
+Creates and returns a TCP or stream-oriented unix domain socket object (also known as one type of the "cosocket" objects). The following methods are supported on this object:
 
 * [[#tcpsock:connect|connect]]
 * [[#tcpsock:send|send]]
@@ -3057,18 +3719,20 @@ It is intended to be compatible with the TCP API of the [http://w3.impa.br/~dieg
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
-== tcpsock:connect ==
-'''syntax:''' ''ok, err = tcpsock:connect(host, port)''
+See also [[#ngx.socket.udp|ngx.socket.udp]].
 
-'''syntax:''' ''ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket")''
+== tcpsock:connect ==
+'''syntax:''' ''ok, err = tcpsock:connect(host, port, options_table?)''
+
+'''syntax:''' ''ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket", options_table?)''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Attempts to connect a TCP socket object to a remote server or to a unix domain socket file nonblockingly.
+Attempts to connect a TCP socket object to a remote server or to a stream unix domain socket file without blocking.
 
 Before actually resolving the host name and connecting to the remote backend, this method will always look up the connection pool for matched idle connections created by previous calls of this method (or the [[#ngx.socket.connect|ngx.socket.connect]] function).
 
-Both IP addresses and domain names can be specified as the <code>host</code> argument. In case of domain names, this method will use Nginx core's dynamic resolver to parse the domain name nonblockingly and it is required to configure the [[HttpCoreModule#resolver|resolver]] directive in your <code>nginx.conf</code> file like this:
+Both IP addresses and domain names can be specified as the <code>host</code> argument. In case of domain names, this method will use Nginx core's dynamic resolver to parse the domain name without blocking and it is required to configure the [[HttpCoreModule#resolver|resolver]] directive in the <code>nginx.conf</code> file like this:
 
 <geshi lang="nginx">
     resolver 8.8.8.8;  # use Google's public DNS nameserver
@@ -3108,7 +3772,7 @@ Connecting to a Unix Domain Socket file is also possible:
     end
 </geshi>
 
-assuming that your memcached (or something else) is listening on the unix domain socket file <code>/tmp/memcached.sock</code>.
+assuming memcached (or something else) is listening on the unix domain socket file <code>/tmp/memcached.sock</code>.
 
 Timeout for the connecting operation is controlled by the [[#lua_socket_connect_timeout|lua_socket_connect_timeout]] config directive and the [[#tcpsock:settimeout|settimeout]] method. And the latter takes priority. For example:
 
@@ -3122,20 +3786,27 @@ It is important here to call the [[#tcpsock:settimeout|settimeout]] method ''bef
 
 Calling this method on an already connected socket object will cause the original connection to be closed first.
 
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
+An optional Lua table can be specified as the last argument to this method to specify various connect options:
+
+* <code>pool</code>
+: specify a custom name for the connection pool being used. If omitted, then the connection pool name will be generated from the string template <code>"<host>:<port>"</code> or <code>"<unix-socket-path>"</code>.
+
+The support for the options table argument was first introduced in the <code>v0.5.7</code> release.
+
+This method was first introduced in the <code>v0.5.0rc1</code> release.
 
 == tcpsock:send ==
 '''syntax:''' ''bytes, err = tcpsock:send(data)''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Sends data nonblockingly on the current TCP or Unix Domain Socket connection.
+Sends data without blocking on the current TCP or Unix Domain Socket connection.
 
 This method is a synchronous operation that will not return until ''all'' the data has been flushed into the system socket send buffer or an error occurs.
 
 In case of success, it returns the total number of bytes that have been sent. Otherwise, it returns <code>nil</code> and a string describing the error.
 
-The input argument `data` can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will automatically copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
+The input argument <code>data</code> can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
 
 Timeout for the sending operation is controlled by the [[#lua_socket_send_timeout|lua_socket_send_timeout]] config directive and the [[#tcpsock:settimeout|settimeout]] method. And the latter takes priority. For example:
 
@@ -3187,7 +3858,7 @@ It is important here to call the [[#tcpsock:settimeout|settimeout]] method ''bef
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
 == tcpsock:receiveuntil ==
-'''syntax:''' ''iterator = tcpsock:receiveuntil(pattern)''
+'''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
@@ -3210,7 +3881,7 @@ In case of error, the iterator function will return <code>nil</code> along with
 
 The iterator function can be called multiple times and can be mixed safely with other cosocket method calls or other iterator function calls.
 
-The iterator function behaves differently (i.e., like a real iterator) when it is called with a <code>size</code> argument. That is, it will read that <code>size</code> of data at earch invocation and will return <code>nil</code> at the last invocation (either sees the boundary pattern or meets an error). For the last successful invocation of the iterator function, the <code>err</code> return value will be <code>nil</code> too. The iterator function will automatically reset after its last successful invocation that returns <code>nil</code> data and <code>nil</code> error. Consider the following example:
+The iterator function behaves differently (i.e., like a real iterator) when it is called with a <code>size</code> argument. That is, it will read that <code>size</code> of data on each invocation and will return <code>nil</code> at the last invocation (either sees the boundary pattern or meets an error). For the last successful invocation of the iterator function, the <code>err</code> return value will be <code>nil</code> too. The iterator function will be reset after the last successful invocation that returns <code>nil</code> data and <code>nil</code> error. Consider the following example:
 
 <geshi lang="lua">
     local reader = sock:receiveuntil("\r\n--abcedhb")
@@ -3242,7 +3913,7 @@ Then for the incoming data stream <code>'hello, world! -agentzh\r\n--abcedhb bla
     read done
 </geshi>
 
-Note that, the actual data returned ''might'' be a little longer than the size limit specified by the <code>size</code> argument when your boundary pattern has ambiguity for streaming parsing. Near the boundary of the data stream, the data string actually returned could also be shorter than the size limit.
+Note that, the actual data returned ''might'' be a little longer than the size limit specified by the <code>size</code> argument when the boundary pattern has ambiguity for streaming parsing. Near the boundary of the data stream, the data string actually returned could also be shorter than the size limit.
 
 Timeout for the iterator function's reading operation is controlled by the [[#lua_socket_read_timeout|lua_socket_read_timeout]] config directive and the [[#tcpsock:settimeout|settimeout]] method. And the latter takes priority. For example:
 
@@ -3260,18 +3931,32 @@ Timeout for the iterator function's reading operation is controlled by the [[#lu
 
 It is important here to call the [[#tcpsock:settimeout|settimeout]] method ''before'' calling the iterator function (note that the <code>receiveuntil</code> call is irrelevant here).
 
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
+As from the <code>v0.5.1</code> release, this method also takes an optional <code>options</code> table argument to control the behavior. The following options are supported:
+
+* <code>inclusive</code>
+
+The <code>inclusive</code> takes a boolean value to control whether to include the pattern string in the returned data string. Default to <code>false</code>. For example,
+
+<geshi lang="lua">
+    local reader = tcpsock:receiveuntil("_END_", { inclusive = true })
+    local data = reader()
+    ngx.say(data)
+</geshi>
+
+Then for the input data stream <code>"hello world _END_ blah blah blah"</code>, then the example above will output <code>hello world _END_</code>, including the pattern string <code>_END_</code> itself.
+
+This method was first introduced in the <code>v0.5.0rc1</code> release.
 
 == tcpsock:close ==
 '''syntax:''' ''ok, err = tcpsock:close()''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Closes the current TCP or Unix Domain socket. It returns the <code>1</code> in case of success and returns <code>nil</code> with a string describing the error otherwise.
+Closes the current TCP or stream unix domain socket. It returns the <code>1</code> in case of success and returns <code>nil</code> with a string describing the error otherwise.
 
-For socket objects that have invoked the [[#tcpsock:setkeepalive|setkeepalive]] method, there is no need to call this method on it because the socket object is already closed (and the current connection is saved into the builtin connection pool).
+Note that there is no need to call this method on socket objects that have invoked the [[#tcpsock:setkeepalive|setkeepalive]] method because the socket object is already closed (and the current connection is saved into the built-in connection pool).
 
-For socket objects that have not invoked [[#tcpsock:setkeepalive|setkeepalive]], they (and their connections) will be automatically closed when the socket object is released by the Lua GC (Garbage Collector) or the current client HTTP request finishes processing.
+Socket objects that have not invoked this method (and associated connections) will be closed when the socket object is released by the Lua GC (Garbage Collector) or the current client HTTP request finishes processing.
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
@@ -3302,13 +3987,13 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Puts the current socket's connection into the cosocket built-in connection pool and keep it alive until other [[#tcpsock:connect|connect]] method calls request it or the associated maximal idle timeout is expired.
+Puts the current socket's connection immediately into the cosocket built-in connection pool and keep it alive until other [[#tcpsock:connect|connect]] method calls request it or the associated maximal idle timeout is expired.
 
 The first optional argument, <code>timeout</code>, can be used to specify the maximal idle timeout (in milliseconds) for the current connection. If omitted, the default setting in the [[#lua_socket_keepalive_timeout|lua_socket_keepalive_timeout]] config directive will be used. If the <code>0</code> value is given, then the timeout interval is unlimited.
 
 The second optional argument, <code>size</code>, can be used to specify the maximal number of connections allowed in the connection pool for the current server (i.e., the current host-port pair or the unix domain socket file path). Note that the size of the connection pool cannot be changed once the pool is created. When this argument is omitted, the default setting in the [[#lua_socket_pool_size|lua_socket_pool_size]] config directive will be used.
 
-When the connection pool is exceeding the size limit, the least recently used (idle) connection already in the pool will be closed automatically to make room for the current connection.
+When the connection pool exceeds the available size limit, the least recently used (idle) connection already in the pool will be closed to make room for the current connection.
 
 Note that the cosocket connection pool is per Nginx worker process rather than per Nginx server instance, so the size limit specified here also applies to every single Nginx worker process.
 
@@ -3316,7 +4001,7 @@ Idle connections in the pool will be monitored for any exceptional events like c
 
 In case of success, this method returns <code>1</code>; otherwise, it returns <code>nil</code> and a string describing the error.
 
-This method also makes the current cosocket object enter the "closed" state, so you do not need to manually call the [[#tcpsock:close|close]] method on it afterwards.
+This method also makes the current cosocket object enter the "closed" state, so there is no need to manually call the [[#tcpsock:close|close]] method on it afterwards.
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
@@ -3349,14 +4034,364 @@ This function is a shortcut for combining [[#ngx.socket.tcp|ngx.socket.tcp()]] a
     return sock
 </geshi>
 
-There is no way to use the [[#tcpsock:settimeout|settimeout]] method to specify connecting timeout for this method. You have to use the [[#lua_socket_connect_timeout|lua_socket_connect_timeout]] directive at configure time instead.
+There is no way to use the [[#tcpsock:settimeout|settimeout]] method to specify connecting timeout for this method and the [[#lua_socket_connect_timeout|lua_socket_connect_timeout]] directive must be set at configure time instead.
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
+== ngx.get_phase ==
+'''syntax:''' ''str = ngx.get_phase()''
+
+'''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
+
+Retrieves the current running phase name. Possible return values are
+
+* <code>init</code>
+: for the context of [[#init_by_lua|init_by_lua]] or [[#init_by_lua_file|init_by_lua_file]].
+* <code>set</code>
+: for the context of [[#set_by_lua|set_by_lua]] or [[#set_by_lua_file|set_by_lua_file]].
+* <code>rewrite</code>
+: for the context of [[#rewrite_by_lua|rewrite_by_lua]] or [[#rewrite_by_lua_file|rewrite_by_lua_file]].
+* <code>access</code>
+: for the context of [[#access_by_lua|access_by_lua]] or [[#access_by_lua_file|access_by_lua_file]].
+* <code>content</code>
+: for the context of [[#content_by_lua|content_by_lua]] or [[#content_by_lua_file|content_by_lua_file]].
+* <code>header_filter</code>
+: for the context of [[#header_filter_by_lua|header_filter_by_lua]] or [[#header_filter_by_lua_file|header_filter_by_lua_file]].
+* <code>body_filter</code>
+: for the context of [[#body_filter_by_lua|body_filter_by_lua]] or [[#body_filter_by_lua_file|body_filter_by_lua_file]].
+* <code>log</code>
+: for the context of [[#log_by_lua|log_by_lua]] or [[#log_by_lua_file|log_by_lua_file]].
+
+This API was first introduced in the <code>v0.5.10</code> release.
+
+== coroutine.create ==
+'''syntax:''' ''co = coroutine.create(f)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Creates a user Lua coroutines with a Lua function, and returns a coroutine object.
+
+Similar to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.create coroutine.create] API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the <code>v0.6.0</code> release.
+
+== coroutine.resume ==
+'''syntax:''' ''ok, ... = coroutine.resume(co, ...)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Resumes the executation of a user Lua coroutine object previously yielded or just created.
+
+Similar to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.resume coroutine.resume] API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the <code>v0.6.0</code> release.
+
+== coroutine.yield ==
+'''syntax:''' ''... = coroutine.yield(co, ...)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Yields the executation of the current user Lua coroutine.
+
+Similar to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.yield coroutine.yield] API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the <code>v0.6.0</code> release.
+
+== coroutine.wrap ==
+'''syntax:''' ''co = coroutine.wrap(f)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Similar to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.wrap coroutine.wrap] API, but works in the context of the Lua coroutines created by ngx_lua.
+
+This API was first introduced in the <code>v0.6.0</code> release.
+
+== coroutine.running ==
+'''syntax:''' ''co = coroutine.running()''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Identical to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running coroutine.running] API.
+
+This API was first enabled in the <code>v0.6.0</code> release.
+
+== coroutine.status ==
+'''syntax:''' ''status = coroutine.status(co)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Identical to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status coroutine.status] API.
+
+This API was first enabled in the <code>v0.6.0</code> release.
+
+== ngx.thread.spawn ==
+'''syntax:''' ''co = ngx.thread.spawn(func, arg1, arg2, ...)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Spawns a new user "light thread" with the Lua function <code>func</code> as well as those optional arguments <code>arg1</code>, <code>arg2</code>, and etc. Returns a Lua thread (or Lua coroutine) object represents this "light thread".
+
+"Light threads" are just a special kind of Lua coroutines that are scheduled by the ngx_lua module.
+
+Before <code>ngx.thread.spawn</code> returns, the <code>func</code> will be called with those optional arguments until it returns, aborts with an error, or gets yielded due to I/O operations via the [[#Nginx API for Lua|Nginx API for Lua]] (like [[#tcpsock:receive|tcpsock:receive]]).
+
+After <code>ngx.thread.spawn</code> returns, the newly-created "light thread" will keep running asynchronously usually at various I/O events.
+
+All the Lua code chunks running by [[#rewrite_by_lua|rewrite_by_lua]], [[#access_by_lua|access_by_lua]], and [[#content_by_lua|content_by_lua]] are in a boilerplate "light thread" created automatically by ngx_lua. Such boilerplate "light thread" are also called "entry threads".
+
+By default, the corresponding Nginx handler (e.g., [[#rewrite_by_lua|rewrite_by_lua]] handler) will not terminate until
+# both the "entry thread" and all the user "light threads" terminates,
+# a "light thread" (either the "entry thread" or a user "light thread" aborts by calling [[#ngx.exit|ngx.exit]], [[#ngx.exec|ngx.exec]], [[#ngx.redirect|ngx.redirect]], or [[#ngx.req.set_uri|ngx.req.set_uri(uri, true)]], or
+# the "entry thread" terminates with a Lua error.
+
+When the user "light thread" terminates with a Lua error, however, it will not abort other running "light threads" like the "entry thread" does.
+
+Due to the limitation in the Nginx subrequest model, it is not allowed to abort a running Nginx subrequest in general. So it is also prohibited to abort a running "light thread" that is pending on one ore more Nginx subrequests. You must call [[#ngx.thread.wait|ngx.thread.wait]] to wait for those "light thread" to terminate before quitting the "world". A notable exception here is that you can abort pending subrequests by calling [[#ngx.exit|ngx.exit]] with and only with the status code <code>ngx.ERROR</code> (-1), <code>408</code>, <code>444</code>, or <code>499</code>.
+
+The "light threads" are not scheduled in a pre-emptive way. In other words, no time-slicing is performed automatically. A "light thread" will keep running exclusively on the CPU until
+# a (nonblocking) I/O operation cannot be completed in a single run,
+# it calls [[#coroutine.yield|coroutine.yield]] to actively give up execution, or
+# it is aborted by a Lua error or an invocation of [[#ngx.exit|ngx.exit]], [[#ngx.exec|ngx.exec]], [[#ngx.redirect|ngx.redirect]], or [[#ngx.req.set_uri|ngx.req.set_uri(uri, true)]].
+
+For the first two cases, the "light thread" will usually be resumed later by the ngx_lua scheduler unless a "stop-the-world" event happens.
+
+User "light threads" can create "light threads" themselves and normal user coroutiens created by [[#coroutine.create|coroutine.create]] can also create "light threads". The coroutine (be it a normal Lua coroutine or a "light thread") that directly spawns the "light thread" is called the "parent coroutine" for the "light thread" newly spawned.
+
+The "parent coroutine" can call [[#ngx.thread.wait|ngx.thread.wait]] to wait on the termination of its child "light thread".
+
+You can call coroutine.status() and coroutine.yield() on the "light thread" coroutines.
+
+The status of the "light thread" coroutine can be "zombie" if
+# the current "light thread" already terminates (either successfully or with an error),
+# its parent coroutine is still alive, and
+# its parent coroutine is not waiting on it with [[#ngx.thread.wait|ngx.thread.wait]].
+
+The following example demonstrates the use of coroutine.yield() in the "light thread" coroutines
+to do manual time-slicing:
+
+<geshi lang="lua">
+    local yield = coroutine.yield
+
+    function f()
+        local self = coroutine.running()
+        ngx.say("f 1")
+        yield(self)
+        ngx.say("f 2")
+        yield(self)
+        ngx.say("f 3")
+    end
+
+    local self = coroutine.running()
+    ngx.say("0")
+    yield(self)
+
+    ngx.say("1")
+    ngx.thread.spawn(f)
+
+    ngx.say("2")
+    yield(self)
+
+    ngx.say("3")
+    yield(self)
+
+    ngx.say("4")
+</geshi>
+
+Then it will generate the output
+
+<geshi lang="text">
+    0
+    1
+    f 1
+    2
+    f 2
+    3
+    f 3
+    4
+</geshi>
+
+"Light threads" are mostly useful for doing concurrent upstream requests in a single Nginx request handler, kinda like a generalized version of [[#ngx.location.capture_multi|ngx.location.capture_multi]] that can work with all the [[#Nginx API for Lua|Nginx API for Lua]]. The following example demonstrates parallel requests to MySQL, Memcached, and upstream HTTP services in a single Lua handler, and outputting the results in the order that they actually return (very much like the Facebook BigPipe model):
+
+<geshi lang="lua">
+    -- query mysql, memcached, and a remote http service at the same time,
+    -- output the results in the order that they
+    -- actually return the results.
+
+    local mysql = require "resty.mysql"
+    local memcached = require "resty.memcached"
+
+    local function query_mysql()
+        local db = mysql:new()
+        db:connect{
+                    host = "127.0.0.1",
+                    port = 3306,
+                    database = "test",
+                    user = "monty",
+                    password = "mypass"
+                  }
+        local res, err, errno, sqlstate =
+                db:query("select * from cats order by id asc")
+        db:set_keepalive(0, 100)
+        ngx.say("mysql done: ", cjson.encode(res))
+    end
+
+    local function query_memcached()
+        local memc = memcached:new()
+        memc:connect("127.0.0.1", 11211)
+        local res, err = memc:get("some_key")
+        ngx.say("memcached done: ", res)
+    end
+
+    local function query_http()
+        local res = ngx.location.capture("/my-http-proxy")
+        ngx.say("http done: ", res.body)
+    end
+
+    ngx.thread.spawn(query_mysql)      -- create thread 1
+    ngx.thread.spawn(query_memcached)  -- create thread 2
+    ngx.thread.spawn(query_http)       -- create thread 3 
+</geshi>
+
+This API was first enabled in the <code>v0.7.0</code> release.
+
+== ngx.thread.wait ==
+'''syntax:''' ''ok, res1, res2, ... = ngx.thread.wait(thread1, thread2, ...)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Waits on one or more child "light threads" and returns the results of the first "light thread" that terminates (either successfully or with an error).
+
+The arguments <code>thread1</code>, <code>thread2</code>, and etc are the Lua thread objects returned by earlier calls of [[#ngx.thread.spawn|ngx.thread.spawn]].
+
+The return values have exactly the same meaning as [[#coroutine.resume|coroutine.resume]], that is, the first value returned is a boolean value indicating whether the "light thread" terminates successfully or not, and subsequent values returned are the return values of the user Lua function that was used to spawn the "light thread" (in case of success) or the error object (in case of failure).
+
+Only the direct "parent coroutine" can wait on its child "light thread", otherwise a Lua exception will be raised.
+
+The following example demonstrates the use of <code>ngx.thread.wait</code> and [[#ngx.location.capture|ngx.location.capture]] to emulate [[#ngx.location.capture_multi|ngx.location.capture_multi]]:
+
+<geshi lang="lua">
+    local capture = ngx.location.capture
+    local spawn = ngx.thread.spawn
+    local wait = ngx.thread.wait
+    local say = ngx.say
+
+    local function fetch(uri)
+        return capture(uri)
+    end
+
+    local threads = {
+        spawn(fetch, "/foo"),
+        spawn(fetch, "/bar"),
+        spawn(fetch, "/baz")
+    }
+
+    for i = 1, #threads do
+        local ok, res = wait(threads[i])
+        if not ok then
+            say(i, ": failed to run: ", res)
+        else
+            say(i, ": status: ", res.status)
+            say(i, ": body: ", res.body)
+        end
+    end
+</geshi>
+
+Here it essentially implements the "wait all" model.
+
+And below is an example demonstrating the "wait any" model:
+
+<geshi lang="lua">
+    function f()
+        ngx.sleep(0.2)
+        ngx.say("f: hello")
+        return "f done"
+    end
+
+    function g()
+        ngx.sleep(0.1)
+        ngx.say("g: hello")
+        return "g done"
+    end
+
+    local tf, err = ngx.thread.spawn(f)
+    if not tf then
+        ngx.say("failed to spawn thread f: ", err)
+        return
+    end
+
+    ngx.say("f thread created: ", coroutine.status(tf))
+
+    local tg, err = ngx.thread.spawn(g)
+    if not tg then
+        ngx.say("failed to spawn thread g: ", err)
+        return
+    end
+
+    ngx.say("g thread created: ", coroutine.status(tg))
+
+    ok, res = ngx.thread.wait(tf, tg)
+    if not ok then
+        ngx.say("failed to wait: ", res)
+        return
+    end
+
+    ngx.say("res: ", res)
+
+    -- stop the "world", aborting other running threads
+    ngx.exit(ngx.OK)
+</geshi>
+
+And it will generate the following output:
+
+<geshi lang="text">
+    f thread created: running
+    g thread created: running
+    g: hello
+    res: g done
+</geshi>
+
+This API was first enabled in the <code>v0.7.0</code> release.
+
+== ngx.on_abort ==
+'''syntax:''' ''ok, err = ngx.on_abort(callback)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+
+Registers a user Lua function as the callback which gets called automatically when the client closes the (downstream) connection prematurely.
+
+Returns <code>1</code> if the callback is registered successfully or returns <code>nil</code> and a string describing the error otherwise.
+
+All the [[#Nginx API for Lua|Nginx API for Lua]] can be used in the callback function because the function is run in a special "light thread", just as those "light threads" created by [[#ngx.thread.spawn|ngx.thread.spawn]].
+
+The callback function can decide what to do with the client abortion event all by itself. For example, it can simply ignore the event by doing nothing and the current Lua request handler will continue executing without interruptions. And the callback function can also decide to terminate everything by calling [[#ngx.exit|ngx.exit]], for example,
+
+<geshi lang="lua">
+    local function my_cleanup()
+        -- custom cleanup work goes here, like cancelling a pending DB transaction
+
+        -- now abort all the "light threads" running in the current request handler
+        ngx.exit(499)
+    end
+
+    local ok, err = ngx.on_abort(my_cleanup)
+    if not ok then
+        ngx.log(ngx.ERR, "failed to register the on_abort callback: ", err)
+        ngx.exit(500)
+    end
+</geshi>
+
+When [[#lua_check_client_abort|lua_check_client_abort]] is set to <code>off</code> (which is the default), then this function call will always return the error message "lua_check_client_abort is off".
+
+According to the current implementation, this function can only be called once in a single request handler; subsequent calls will return the error message "duplicate call".
+
+This API was first introduced in the <code>v0.7.4</code> release.
+
+See also [[#lua_check_client_abort|lua_check_client_abort]].
+
 == ndk.set_var.DIRECTIVE ==
 '''syntax:''' ''res = ndk.set_var.DIRECTIVE_NAME''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*''
 
 This mechanism allows calling other nginx C modules' directives that are implemented by [https://github.com/simpl/ngx_devel_kit Nginx Devel Kit] (NDK)'s set_var submodule's <code>ndk_set_var_value</code>.
 
@@ -3390,35 +4425,68 @@ Similarly, the following directives provided by [[HttpEncryptedSessionModule]] c
 
 This feature requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit] module.
 
+= Lua/LuaJIT bytecode support =
+
+As from the <code>v0.5.0rc32</code> release, all <code>*_by_lua_file</code> configure directives (such as [[#content_by_lua_file|content_by_lua_file]]) support loading Lua 5.1 and LuaJIT 2.0 raw bytecode files directly.
+
+Please note that the bytecode format used by LuaJIT 2.0 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+
+<geshi lang="bash">
+    /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.luac
+</geshi>
+
+The <code>-bg</code> option can be used to include debug information in the LuaJIT bytecode file:
+
+<geshi lang="bash">
+    /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.luac
+</geshi>
+
+Please refer to the official LuaJIT documentation on the <code>-b</code> option for more details:
+
+http://luajit.org/running.html#opt_b
+
+Similarly, if using the standard Lua 5.1 interpreter with ngx_lua, Lua compatible bytecode files must be generated using the <code>luac</code> commandline utility as shown:
+
+<geshi lang="bash">
+    luac -o /path/to/output_file.luac /path/to/input_file.lua
+</geshi>
+
+Unlike as with LuaJIT, debug information is included in standard Lua 5.1 bytecode files by default. This can be striped out by specifying the <code>-s</code> option as shown:
+
+<geshi lang="bash">
+    luac -s -o /path/to/output_file.luac /path/to/input_file.lua
+</geshi>
+
+Attempts to load standard Lua 5.1 bytecode files into ngx_lua instances linked to LuaJIT 2.0 or vice versa, will result in an error message, such as that below, being logged into the Nginx <code>error.log</code> file:
+
+<geshi lang="text">
+    [error] 13909#0: *1 failed to load Lua inlined code: bad byte-code header in /path/to/test_file.luac
+</geshi>
+
+Loading bytecode files via the Lua primitives like <code>require</code> and <code>dofile</code> should always work as expected.
+
 = HTTP 1.0 support =
 
-The HTTP 1.0 protocol does not support chunked outputs and always requires an
-explicit <code>Content-Length</code> header when the response body is non-empty in order to support the HTTP 1.0 keep-alive (as required by the ApacheBench (ab) tool). So when
-an HTTP 1.0 request is present and the [[#lua_http10_buffering|lua_http10_buffering]] directive is turned <code>on</code>, this module will automatically buffer all the
-outputs of user calls of [[#ngx.say|ngx.say]] and [[#ngx.print|ngx.print]] and
-postpone sending response headers until it sees all the outputs in the response
-body, and at that time ngx_lua can calculate the total length of the body and
-construct a proper <code>Content-Length</code> header for the HTTP 1.0 client.
+The HTTP 1.0 protocol does not support chunked output and requires an explicit <code>Content-Length</code> header when the response body is not empty in order to support the HTTP 1.0 keep-alive.
+So when a HTTP 1.0 request is made and the [[#lua_http10_buffering|lua_http10_buffering]] directive is turned <code>on</code>, ngx_lua will buffer the
+output of [[#ngx.say|ngx.say]] and [[#ngx.print|ngx.print]] calls and also postpone sending response headers until all the response body output is received.
+At that time ngx_lua can calculate the total length of the body and construct a proper <code>Content-Length</code> header to return to the HTTP 1.0 client.
+If the <code>Content-Length</code> response header is set in the running Lua code, however, this buffering will be disabled even if the [[#lua_http10_buffering|lua_http10_buffering]] directive is turned <code>on</code>.
 
-If the user Lua code sets the <code>Content-Length</code> response header itself, then the automatic buffering will be disabled even if the [[#lua_http10_buffering|lua_http10_buffering]] directive is turned <code>on</code>.
+For large streaming output responses, it is important to disable the [[#lua_http10_buffering|lua_http10_buffering]] directive to minimise memory usage.
 
-For big responses' streaming outputs, it's important to disable the [[#lua_http10_buffering|lua_http10_buffering]] directive, otherwise the memory usage will grow very quickly.
-
-Note that, common HTTP benchmark tools like <code>ab</code> and <code>http_load</code> always issue
-HTTP 1.0 requests by default. To force <code>curl</code> to send HTTP 1.0 requests, use
-the <code>-0</code> option.
+Note that common HTTP benchmark tools such as <code>ab</code> and <code>http_load</code> issue HTTP 1.0 requests by default.
+To force <code>curl</code> to send HTTP 1.0 requests, use the <code>-0</code> option.
 
 = Data Sharing within an Nginx Worker =
 
-'''NOTE: This mechanism behaves differently when code cache is turned off and should be considered a DIRTY TRICK. Note that backward compatibility is NOT guaranteed and that there may be other undesirable consequences. A new data sharing mechanism will be designed later.'''
-
 To globally share data among all the requests handled by the same nginx worker process, encapsulate the shared data into a Lua module, use the Lua <code>require</code> builtin to import the module, and then manipulate the shared data in Lua. This works because required Lua modules are loaded only once and all coroutines will share the same copy of the module. Note however that Lua global variables WILL NOT persist between requests because of the one-coroutine-per-request isolation design.
 
 Here is a complete small example:
 
 <geshi lang="lua">
     -- mydata.lua
-    module("mydata", package.seeall)
+    module(...)
  
     local data = {
         dog = 3,
@@ -3435,8 +4503,8 @@ and then accessing it from <code>nginx.conf</code>:
 
 <geshi lang="nginx">
     location /lua {
-        content_lua_by_lua '
-            local mydata = require("mydata")
+        content_by_lua '
+            local mydata = require "mydata"
             ngx.say(mydata.get_age("dog"))
         ';
     }
@@ -3447,50 +4515,60 @@ and all subsequent requests to the same nginx worker process will use the reload
 module as well as the same copy of the data in it, until a <code>HUP</code> signal is sent to the Nginx master process to force a reload.
 This data sharing technique is essential for high performance Lua applications based on this module.
 
-Note that this data sharing is on a ''per-worker'' basis and not on a ''per-server' basis'. That is, when there are multiple nginx worker processes under an Nginx master, data sharing cannot cross the process boundary between these workers. 
+Note that this data sharing is on a ''per-worker'' basis and not on a ''per-server'' basis. That is, when there are multiple nginx worker processes under an Nginx master, data sharing cannot cross the process boundary between these workers.
 
-If server wide data sharing is required:
-# Use the [[#ngx.shared.DICT|ngx.shared.DICT]] API provied by this module.
-# Use only a single nginx worker and a single server. This is however not recommended when there is a multi core CPU or multiple CPUs in a single machine.
-# Use data storage mechanisms such as <code>memcached</code>, <code>redis</code>, <code>MySQL</code> or <code>PostgreSQL</code>. [http://openresty.org The ngx_openresty bundle] associated with this module comes with a set of companion Nginx modules that provide interfaces with these data storage mechanisms.  See the [[HttpMemcModule]], [[HttpRedis2Module]], [[HttpDrizzleModule]] and [http://github.com/FRiCKLE/ngx_postgres/ HttpPostgresModule] modules for details
+If server-wide data sharing is required, then use one or more of the following approaches:
+# Use the [[#ngx.shared.DICT|ngx.shared.DICT]] API provided by this module.
+# Use only a single nginx worker and a single server (this is however not recommended when there is a multi core CPU or multiple CPUs in a single machine).
+# Use data storage mechanisms such as <code>memcached</code>, <code>redis</code>, <code>MySQL</code> or <code>PostgreSQL</code>. [http://openresty.org The ngx_openresty bundle] associated with this module comes with a set of companion Nginx modules and Lua libraries that provide interfaces with these data storage mechanisms.
 
 = Known Issues =
 
+== TCP socket connect operation issues ==
+The [[#tcpsock:connect|tcpsock:connect]] method may indicate <code>success</code> despite connection failures such as with <code>Connection Refused</code> errors. 
+
+However, later attempts to manipulate the cosocket object will fail and return the actual error status message generated by the failed connect operation. 
+
+This issue is due to limitations in the Nginx event model and only appears to affect Mac OS X.
+
 == Lua Coroutine Yielding/Resuming ==
 * As the module's predefined Nginx I/O API uses the coroutine yielding/resuming mechanism, user code should not call any Lua modules that use the Lua coroutine mechanism in order to prevent conflicts with the module's predefined Nginx API methods such as [[#ngx.location.capture|ngx.location.capture]] (Actually, coroutine modules have been masked off in [[#content_by_lua|content_by_lua]] directives and others). This limitation is significant and work is ongoing on an alternative coroutine implementation that can fit into the Nginx event model to address this. When this is done, it will be possible to use the Lua coroutine mechanism freely as it is in standard Lua implementations.
-* Lua's <code>dofile</code> builtin is implemented as a C function in both Lua 5.1 and LuaJIT 2.0 and when [[#ngx.location.capture|ngx.location.capture]] is called, [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]] or [[#ngx.req.read_body|ngx.req.read_body]] or similar in the file to be loaded by <code>dofile</code>, a coroutine yield across the C function boundary will be initiated. This however is not allowed within ngx_lua and will usually result in error messages like <code>lua handler aborted: runtime error: attempt to yield across C-call boundary</code>. To avoid this, define a real Lua module and use the Lua <code>require</code> builtin instead.
-* Because the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [[#ngx.location.capture|ngx.location.capture]], [[#ngx.location.capture_multi|ngx.location.capture_multi]], [[#ngx.redirect|ngx.redirect]], [[#ngx.exec|ngx.exec]], and [[#ngx.exit|ngx.exit]] cannot be used within the context of a Lua [http://www.lua.org/manual/5.1/manual.html#pdf-pcall pcall()] or [http://www.lua.org/manual/5.1/manual.html#pdf-xpcall xpcall()] when the standard Lua 5.1 interpreter is used and the <code>attempt to yield across metamethod/C-call boundary</code> error will be produced. Please use LuaJIT 2.0, which supports a fully resumable VM, to avoid this.
+* Lua's <code>dofile</code> builtin is implemented as a C function in both Lua 5.1 and LuaJIT 2.0 and when [[#ngx.location.capture|ngx.location.capture]] is called, [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]] or [[#ngx.req.read_body|ngx.req.read_body]] or similar in the file to be loaded by <code>dofile</code>, a coroutine yield across the C function boundary will be initiated. This however is not normally allowed within ngx_lua and will usually result in error messages like <code>lua handler aborted: runtime error: attempt to yield across C-call boundary</code>. To avoid this, define a real Lua module and use the Lua <code>require</code> builtin instead.
+* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [[#ngx.location.capture|ngx.location.capture]], [[#ngx.location.capture_multi|ngx.location.capture_multi]], [[#ngx.redirect|ngx.redirect]], [[#ngx.exec|ngx.exec]], and [[#ngx.exit|ngx.exit]] cannot be used within the context of a Lua [http://www.lua.org/manual/5.1/manual.html#pdf-pcall pcall()] or [http://www.lua.org/manual/5.1/manual.html#pdf-xpcall xpcall()] when the standard Lua 5.1 interpreter is used and the <code>attempt to yield across metamethod/C-call boundary</code> error will be produced. Please use LuaJIT 2.0, which supports a fully resumable VM, to avoid this.
 
 == Lua Variable Scope ==
 Care should be taken when importing modules and this form should be used:
 
-<geshi lang="nginx">
-        local xxx = require('xxx')
+<geshi lang="lua">
+    local xxx = require('xxx')
 </geshi>
 
 : instead of the old deprecated form:
 
-<geshi lang="nginx">
-        require('xxx')
+<geshi lang="lua">
+    require('xxx')
 </geshi>
 
 : If the old form is required, force reload the module for every request by using the <code>package.loaded.<module></code> command:
 
-<geshi lang="nginx">
-        package.loaded.xxx = nil
-        require('xxx')
+<geshi lang="lua">
+    package.loaded.xxx = nil
+    require('xxx')
 </geshi>
 
-It is recommended to always place the following piece of code at the end of Lua modules that use the [[#ngx.location.capture|ngx.location.capture]] or [[#ngx.location.capture_multi|ngx.location.capture_multi]] directives to prevent casual use of module-level global variables that are shared among ''all'' requests:
+It is recommended to always place the following piece of code at the end of Lua modules that use the I/O operations to prevent casual use of module-level global variables that are shared among ''all'' requests:
 
-<geshi lang="nginx">
-    getmetatable(foo.bar).__newindex = function (table, key, val)
-        error('Attempt to write to undeclared variable "' .. key .. '": '
-                .. debug.traceback())
-    end
+<geshi lang="lua">
+    local class_mt = {
+        -- to prevent use of casual module global variables
+        __newindex = function (table, key, val)
+            error('attempt to write to undeclared variable "' .. key .. '"')
+        end
+    }
+    setmetatable(_M, class_mt)
 </geshi>
 
-Assuming the current Lua module is named <code>foo.bar</code>, this will guarantee that local variables in module <code>foo.bar</code> functions have been declared as "local". It prevents undesirable race conditions while accessing such variables. See [[#Data_Sharing_within_an_Nginx_Worker|Data Sharing within an Nginx Worker]] for the reasons behind this.
+This will guarantee that local variables in the Lua module functions are all declared with the <code>local</code> keyword, otherwise a runtime exception will be thrown. It prevents undesirable race conditions while accessing such variables. See [[#Data_Sharing_within_an_Nginx_Worker|Data Sharing within an Nginx Worker]] for the reasons behind this.
 
 == Locations Configured by Subrequest Directives of Other Modules ==
 The [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]] directives cannot capture locations that include the [[HttpEchoModule#echo_location|echo_location]], [[HttpEchoModule#echo_location_async|echo_location_async]], [[HttpEchoModule#echo_subrequest|echo_subrequest]], or [[HttpEchoModule#echo_subrequest_async|echo_subrequest_async]] directives.
@@ -3498,7 +4576,7 @@ The [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_m
 <geshi lang="nginx">
     location /foo {
         content_by_lua '
-            res = ngx.location.capature("/bar")
+            res = ngx.location.capture("/bar")
         ';
     }
     location /bar {
@@ -3563,13 +4641,13 @@ Alternatively, the regex pattern can be presented as a long-bracketed Lua string
 Here, <code>&#91;[\\d+]]</code> is stripped down to <code>&#91;[\d+]]</code> by the Nginx config file parser and this is processed correctly.
 
 Note that a longer from of the long bracket, <code>[=[...]=]</code>, may be required if the regex pattern contains <code>&#91;...]</code> sequences. 
-The <code>[=[...]=]</code> form may be used as the default form if desired and it may help with readability if a space is inserted between the long brackets and the regex patterns.
+The <code>[=[...]=]</code> form may be used as the default form if desired.
 
 <geshi lang="nginx">
     # nginx.conf
     location /test {
         content_by_lua '
-            local regex = [=[ [0-9]+ ]=]
+            local regex = [=[[0-9]+]=]
             local m = ngx.re.match("hello, 1234", regex)
             if m then ngx.say(m[0]) else ngx.say("not matched!") end
         ';
@@ -3614,19 +4692,19 @@ The possibilities are unlimited as the module allows bringing together various e
 
 Other scripting language implementations typically struggle to match this performance level.
 
-The Lua state (Lua VM instance) is shared across all the requests handled by a single nginx worker process to miminize memory use.
+The Lua state (Lua VM instance) is shared across all the requests handled by a single nginx worker process to minimize memory use.
 
-On a ThinkPad T400 2.80 GHz laptop, the HelloWorld example readily achieves 28k req/sec using <code>http_load -p 10</code>. By contrast, Nginx + php-fpm 5.2.8 + Unix Domain Socket yields 6k req/sec and [http://nodejs.org/ Node.js] v0.6.1 yields 10.2k req/sec for their HelloWorld equivalents.
-
-This module performs best when built with [http://luajit.org/luajit.html LuaJIT 2.0].
+On a ThinkPad T400 2.80 GHz laptop, the Hello World example readily achieves 28k req/sec using <code>http_load -p 10</code>. By contrast, Nginx + php-fpm 5.2.8 + Unix Domain Socket yields 6k req/sec and [http://nodejs.org/ Node.js] v0.6.1 yields 10.2k req/sec for their Hello World equivalents.
 
 = Nginx Compatibility =
 The module is compatible with the following versions of Nginx:
 
-*   1.1.x (last tested: 1.1.5)
-*   1.0.x (last tested: 1.0.15)
-*   0.9.x (last tested: 0.9.4)
-*   0.8.x >= 0.8.54 (last tested: 0.8.54)
+* 1.3.x (last tested: 1.3.7)
+* 1.2.x (last tested: 1.2.4)
+* 1.1.x (last tested: 1.1.5)
+* 1.0.x (last tested: 1.0.15)
+* 0.9.x (last tested: 0.9.4)
+* 0.8.x >= 0.8.54 (last tested: 0.8.54)
 
 = Code Repository =
 
@@ -3634,29 +4712,29 @@ The code repository of this project is hosted on github at [http://github.com/ch
 
 = Installation =
 
-The [http://openresty.org ngx_openresty bundle] can be used to install Nginx, <code>ngx_lua</code>, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0, as well as a package of powerful companion Nginx modules. The basic installation step is a simple <code>./configure --with-luajit && make && make install</code>.
+The [http://openresty.org ngx_openresty bundle] can be used to install Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0, as well as a package of powerful companion Nginx modules. The basic installation step is a simple <code>./configure --with-luajit && make && make install</code>.
 
-Alternatively, <code>ngx_lua</code> can be manually compiled into Nginx:
+Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# Install LuaJIT 2.0 (Recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). Lua can be obtained free from the [http://luajit.org/download.html the LuaJIT download page] or [http://www.lua.org/ the standard Lua homepage].  Some distribution package managers also distribute Lua and LuaJIT.
+# Install LuaJIT 2.0 (Recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuajIT can be downloaded from the [http://luajit.org/download.html the LuaJIT project website] and Lua 5.1, from the [http://www.lua.org/ Lua project website].  Some distribution package managers also distribute LuajIT and/or Lua.
 # Download the latest version of the ngx_devel_kit (NDK) module [http://github.com/simpl/ngx_devel_kit/tags HERE].
-# Download the latest version of this module [http://github.com/chaoslawful/lua-nginx-module/tags HERE].
+# Download the latest version of ngx_lua [http://github.com/chaoslawful/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
 
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.0.15.tar.gz'
-    tar -xzvf nginx-1.0.15.tar.gz
-    cd nginx-1.0.15/
+    wget 'http://nginx.org/download/nginx-1.2.4.tar.gz'
+    tar -xzvf nginx-1.2.4.tar.gz
+    cd nginx-1.2.4/
+
+    # tell nginx's build system where to find LuaJIT:
+    export LUAJIT_LIB=/path/to/luajit/lib
+    export LUAJIT_INC=/path/to/luajit/include/luajit-2.0
  
-    # tell nginx's build system where to find lua:
-    export LUA_LIB=/path/to/lua/lib
-    export LUA_INC=/path/to/lua/include
- 
-    # or tell where to find LuaJIT when if using JIT instead
-    # export LUAJIT_LIB=/path/to/luajit/lib
-    # export LUAJIT_INC=/path/to/luajit/include/luajit-2.0
+    # or tell where to find Lua if using Lua instead:
+    #export LUA_LIB=/path/to/lua/lib
+    #export LUA_INC=/path/to/lua/include
  
     # Here we assume Nginx is to be installed under /opt/nginx/.
     ./configure --prefix=/opt/nginx \
@@ -3667,123 +4745,66 @@ Build the source with this module:
     make install
 </geshi>
 
+== Installation on Ubuntu 11.10 ==
+
+Note that it is recommended to use LuaJIT 2.0 instead of the standard Lua 5.1 interpreter where possible. 
+
+If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
+
+<geshi lang="bash">
+apt-get install -y lua5.1 liblua5.1-0 liblua5.1-0-dev
+</geshi>
+
+Everything should be installed correctly, except for one small tweak. 
+
+Library name <code>liblua.so</code> has been changed in liblua5.1 package, it only comes with <code>liblua5.1.so</code>, which needs to be symlinked to <code>/usr/lib</code> so it could be found during the configuration process.
+
+<geshi lang="bash">
+ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
+</geshi>
+
+= Community =
+
+== English Mailing List ==
+
+The [https://groups.google.com/group/openresty-en openresty-en] mailing list is for English speakers.
+
+== Chinese Mailing List ==
+
+The [https://groups.google.com/group/openresty openresty] mailing list is for Chinese speakers.
+
 = Bugs and Patches =
 
-Please report bugs or submit patches by:
+Please submit bug reports, wishlists, or patches by
 
-# Creating a ticket on the [http://github.com/chaoslawful/lua-nginx-module/issues GitHub Issue Tracker] (Recommended)
-# Posting to the [http://mailman.nginx.org/mailman/listinfo/nginx Nginx Mailing List] and also adding <code>[ngx_lua]</code> to the mail subject.
+# creating a ticket on the [http://github.com/chaoslawful/lua-nginx-module/issues GitHub Issue Tracker],
+# or posting to the [[#Community|OpenResty community]].
 
 = TODO =
 
 == Short Term ==
-* implement the <code>ngx.sleep(time)</code> Lua API. (For now, use [[#ngx.location.capture|ngx.location.capture]] with [[HttpEchoModule]]'s [[HttpEchoModule#echo_sleep|echo_sleep]] config directive instead.)
-* implement the <code>ngx.worker.get_pid()</code> Lua API. (For now, use <code>ngx.var.pid</code> directly.)
-* implement [http://w3.impa.br/~diego/software/luasocket/udp.html LuaSocket UDP API] in our cosocket API.
+* review and apply Brian Akin's patch for the new directive <code>lua_socket_log_errors</code>.
+* review and apply Brian Akin's patch for the new <code>shdict:flush_expired()</code> API.
 * implement the SSL cosocket API.
-* implement the <code>ngx.re.split</code> method.
+* review and apply Jader H. Silva's patch for <code>ngx.re.split()</code>.
+* review and apply vadim-pavlov's patch for [[#ngx.location.capture|ngx.location.capture]]'s <code>extra_headers</code> option
 * use <code>ngx_hash_t</code> to optimize the built-in header look-up process for [[#ngx.req.set_header|ngx.req.set_header]], [[#ngx.header.HEADER|ngx.header.HEADER]], and etc.
 * add configure options for different strategies of handling the cosocket connection exceeding in the pools.
-* add directives to run Lua codes when nginx stops/reloads.
+* add directives to run Lua codes when nginx stops.
 * add APIs to access cookies as key/value pairs.
 * add <code>ignore_resp_headers</code>, <code>ignore_resp_body</code>, and <code>ignore_resp</code> options to [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]] methods, to allow micro performance tuning on the user side.
+* implement new directive <code>lua_ignore_client_abort</code>.
 
 == Longer Term ==
-* add the <code>lua_require</code> directive to load module into main thread's globals.
-* add Lua code automatic time slicing support by yielding and resuming the Lua VM actively via Lua's debug hooks.
-* make [[#set_by_lua|set_by_lua]], [[#header_filter_by_lua|header_filter_by_lua]], and their variants use the same mechanism as [[#content_by_lua|content_by_lua]], [[#rewrite_by_lua|rewrite_by_lua]], [[#access_by_lua|access_by_lua]], and their variants.
-* add coroutine API back to the Lua user land.
+* add lightweight thread API (i.e., the <code>ngx.thread</code> API) as demonstrated in [http://agentzh.org/misc/nginx/lua-thread2.lua this sample code].
+* add automatic Lua code time slicing support by yielding and resuming the Lua VM actively via Lua's debug hooks.
 * add <code>stat</code> mode similar to [http://httpd.apache.org/docs/2.3/mod/mod_lua.html mod_lua].
 
 = Changes =
 
-== v0.4.1 ==
+The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
 
-1 February, 2012
-
-* bugfix: [[#ngx.exit|ngx.exit]], [[#ngx.redirect|ngx.redirect]], [[#ngx.exec|ngx.exec]], and [[#ngx.req.set_uri|ngx.req.set_uri(uri, true)]] could return (they should never return as per the documentation). this bug had appeared in ngx_lua v0.3.1rc4 and ngx_openresty 1.0.6.13. thanks [http://weibo.com/cyberty @cyberty] for reporting it.
-* bugfix: <code>ngx_http_lua_header_filter_init</code> was called with an argument which actually accepts none. this could cause compilation errors at least with gcc 4.3.4 as reported in [http://github.com/chaoslawful/lua-nginx-module/issues/80 github issue #80]. thanks bigplum (Simon).
-* bugfix: fixed all the warnings from the clang static analyzer.
-* feature: allow use of the <code>DDEBUG</code> macro from the outside (via the <code>-D DDEBUG=1</code> C compiler opton).
-
-== v0.4.0 ==
-
-11 January, 2012
-
-* bugfix: fixed a bug when the both the main request and the subrequest are POST requests with a body: we should not forward the main request's <code>Content-Length</code> headers to the user subrequests. thanks 朱峰.
-* feature: implemented the API for reading response headers from within Lua: <code>value = ngx.header.HEADER</code>, see [[#ngx.header.HEADER|ngx.header.HEADER]].
-* bugfix: fixed a bug when setting a multi-value response header to a single value (via writing to [[#ngx.header.HEADER|ngx.header.HEADER]]): the single value will be repeated on each old value.
-* bugfix: fixed an issue in [[#ngx.redirect|ngx.redirect]], [[#ngx.exit|ngx.exit]], and [[#ngx.exec|ngx.exec]]: these function calls would be intercepted by Lua <code>pcall</code>/<code>xpcall</code> because they used Lua exceptions; now they use Lua yield just as [[#ngx.location.capture|ngx.location.capture]]. thanks @hugozhu for reporting this.
-* feature: now we also return the <code>Last-Modified</code> header (if any) for the subrequest response object. thanks @cyberty and sexybabes.
-* feature: now [[#ngx.exec|ngx.exec]] supports Lua table as the second args argument value. thanks sexybabes.
-* feature: implemented the [[#ngx.headers_sent|ngx.headers_sent]] API to check if response headers are sent (by ngx_lua). thanks @hugozhu.
-* feature: exposes the CRC-32 API of the Nginx core to the Lua land, in the form of the [[#ngx.crc32_short|ngx.crc32_short]] and [[#ngx.crc32_long|ngx.crc32_long]] methods. thanks @Lance.
-* feature: now for HTTP 1.0 requests, we disable the automatic full buffering mode if the user sets the <code>Content-Length</code> response header before sending out the headers. this allows streaming output for HTTP 1.0 requests if the content length can be calculated beforehand. thanks 李子义.
-* bugfix: now we properly support setting the <code>Cache-Control</code> response header via the [[#ngx.header.HEADER|ngx.header.HEADER]] interface.
-* bugfix: no longer set header hash to <code>1</code>. use the <code>ngx_hash_key_lc</code> instead.
-* bugfix: calling [[#ngx.exec|ngx.exec]] to jump to a named location did not clear the context object of LuaNginxModule properly and might cause evil problems. thanks Nginx User.
-* bugfix: now we explicitly clear all the modules' contexts before dump to named location with [[#ngx.exec|ngx.exec]].
-* feature: implemented [[#ngx.req.set_uri|ngx.req.set_uri]] and [[#ngx.req.set_uri_args|ngx.req.set_uri_args]] to emulate [[HttpRewriteModule]]'s [[HttpRewriteModule#rewrite|rewrite]] directive. thanks Vladimir Protasov (utros) and Nginx User.
-* bugfix: now we skip rewrite phase Lua handlers altogether if [[HttpRewriteModule]]'s [[HttpRewriteModule#rewrite|rewrite]] directive issue a location re-lookup by changing URIs (but not including <code>rewrite ... break</code>). thanks Nginx User.
-* feature: added constant <code>ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)</code>. thanks Nginx User.
-* feature: added new Lua functions [[#ngx.req.read_body|ngx.req.read_body]], [[#ngx.req.discard_body|ngx.req.discard_body]], [[#ngx.req.get_body_data|ngx.req.get_body_data]], and [[#ngx.req.get_body_file|ngx.req.get_body_file]]. thanks Tzury Bar Yochay for funding the development work.
-* bugfix: fixed hanging issues when using [[#ngx.exec|ngx.exec]] within [[#rewrite_by_lua|rewrite_by_lua]] and [[#access_by_lua|access_by_lua]]. thanks Nginx User for reporting it.
-* feature: added new Lua API [[#ngx.req.set_body_file|ngx.req.set_body_file]]. thanks Tzury Bar Yochay for funding the development work.
-* feature: added new Lua API [[#ngx.req.set_body_data|ngx.req.set_body_data]]. thanks Tzury Bar Yochay for funding the development work.
-* bugfix: [[#lua_need_request_body|lua_need_request_body]] should not skip requests with methods other than <code>POST</code> and <code>PUT</code>. thanks Nginx User.
-* bugfix: no longer free request body buffers that are not allocated by ourselves.
-* bugfix: now we allow setting [[#ngx.var.VARIABLE|ngx.var.VARIABLE]] to nil.
-* feature: added new directive [[#lua_shared_dict|lua_shared_dict]].
-* feature: added Lua API for the shm-based dictionary, see [[#ngx.shared.DICT|ngx.shared.DICT]].
-* bugfix: fixed spots of -Werror=unused-but-set-variable warning issued by gcc 4.6.0.
-* bugfix: [[#ndk.set_var.DIRECTIVE|ndk.set_var.DIRECTIVE]] had a memory issue and might pass empty argument values to the directive being called. thanks dannynoonan.
-* feature: added the <code>ctx</code> option to [[#ngx.location.capture|ngx.location.capture]]: you can now specify a custom Lua table to pass to the subrequest as its [[#ngx.ctx|ngx.ctx]]. thanks @hugozhu.
-* feature: added the [[#ngx.encode_args|ngx.encode_args]] method to encode a Lua code to a URI query string. thanks 郭颖 (0597虾).
-* feature: [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.exec|ngx.exec]] now supports the same Lua args table format as in ngx.encode_args. thanks 郭颖 (0597虾).
-* bugfix: <code>Cache-Control</code> header modification might introduce empty value headers when using with the standard HttpHeadersModule.
-* feature: added [[#ngx.hmac_sha1|ngx.hmac_sha1]]. thanks drdrxp.
-* docs: documented the long-existent [[#ngx.md5|ngx.md5]] and [[#ngx.md5_bin|ngx.md5_bin]] APIs.
-* docs: massive documentation improvements. thanks Nginx User.
-* feature: added new regex options <code>j</code> and <code>d</code> to [[#ngx.re.match|ngx.re.match]], [[#ngx.re.gmatch|ngx.re.gmatch]], [[#ngx.re.sub|ngx.re.sub]], and [[#ngx.re.gsub|ngx.re.gsub]] so as to enable the PCRE JIT mode and DFA mode, respectively. thanks @姜大炮 for providing the patch.
-* feature: added options <code>copy_all_vars</code> and <code>vars</code> to [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_multi|ngx.location.capture_multi]]. thanks Marcus Clyne for the patch.
-* feature: added new Lua API [[#ngx.now|ngx.now]] to return the current time (including the milliseconds part as the decimal part). thanks 林青.
-* feature: added new Lua API [[#ngx.update_time|ngx.update_time]] to forcibly updating Nginx's time cache.
-* feature: added <code>wait</code> boolean argument to [[#ngx.flush|ngx.flush]] to support synchronous flushing: <code>ngx.flush(true)</code> will not return until all the data has been flushed into the system send buffer or the send timeout has expired.
-* bugfix: now we check timed out downstream connections in our write event handler.
-* feature: added constant <code>ngx.HTTP_GATEWAY_TIMEOUT (504)</code> per Fry-kun in [https://github.com/chaoslawful/lua-nginx-module/issues/73 github issue #73].
-* bugfix: [[#ngx.var.VARIABLE|ngx.var.VARIABLE]] did not evaluate to <code>nil</code> when the Nginx variable's <code>valid</code> flag is <code>0</code>.
-* bugfix: there were various places where we did not check the pointer returned by the memory allocator.
-* bugfix: [[#ngx.req.set_header|ngx.req.set_header]] and [[#ngx.req.clear_header|ngx.req.clear_header]] did not handle the <code>Accept-Encoding</code> request headers properly. thanks 天街夜色.
-* bugfix: [[#ngx.req.set_header|ngx.req.set_header]] might cause invalid memory reads because Nginx request header values must be <code>NULL</code> terminated. thanks Maxim Dounin.
-* bugfix: removing builtin headers via [[#ngx.req.clear_header|ngx.req.clear_header]] and its equivalent in huge request headers with 20+ entries could result in data loss. thanks Chris Dumoulin.
-* bugfix: [[#ngx.req.get_uri_args|ngx.req.get_uri_args]] and [[#ngx.req.get_post_args|ngx.req.get_post_args]] now only parse up to <code>100</code> arguments by default. but one can specify the optional argument to these two methods to specify a custom maximum number of args. thanks Tzury Bar Yochay for reporting this.
-* bugfix: [[#ngx.req.get_headers|ngx.req.get_headers]] now only parse up to <code>100</code> request headers by default. but one can specify the optional argument to this method to specify a custom maximum number of headers.
-
-== v0.3.0 ==
-
-September 02, 2011
-
-'''New features'''
-
-* added the [[#header_filter_by_lua|header_filter_by_lua]] and [[#header_filter_by_lua_file|header_filter_by_lua_file]] directives. thanks Liseen Wan (万珣新).
-* implemented the PCRE regex API for Lua: [[#ngx.re.match|ngx.re.match]], [[#ngx.re.gmatch|ngx.re.gmatch]], [[#ngx.re.sub|ngx.re.sub]], and [[#ngx.re.gsub|ngx.re.gsub]].
-* now we add the <code>ngx</code> and <code>ndk</code> table into <code>package.loaded</code> such that the user can write <code>local ngx = require 'ngx'</code> and <code>local ndk = require 'ndk'</code>. thanks @Lance.
-* added new directive [[#lua_regex_cache_max_entries|lua_regex_cache_max_entries]] to control the upper limit of the worker-process-level compiled-regex cache enabled by the <code>o</code> regex option.
-* implemented the special [[#ngx.ctx|ngx.ctx]] Lua table for user programmers to store per-request Lua context data for their applications. thanks 欧远宁 for suggesting this feature.
-* now [[#ngx.print|ngx.print]] and [[#ngx.say|ngx.say]] allow (nested) array-like table arguments. the array elements in them will be sent piece by piece. this will avoid string concatenation for templating engines like [http://www.savarese.com/software/ltp/ ltp].
-* implemented the [[#ngx.req.get_post_args|ngx.req.get_post_args]] method for fetching url-encoded POST query arguments from within Lua.
-* implemented the [[#ngx.req.get_uri_args|ngx.req.get_uri_args]] method to fetch parsed URL query arguments from within Lua. thanks Bertrand Mansion (golgote).
-* added new function [[#ngx.parse_http_time|ngx.parse_http_time]], thanks James Hurst.
-* now we allow Lua boolean and <code>nil</code> values in arguments to [[#ngx.say|ngx.say]], [[#ngx.print|ngx.print]], [[#ngx.log|ngx.log]] and [[#print|print]].
-* added support for user C macros <code>LUA_DEFAULT_PATH</code> and <code>LUA_DEFAULT_CPATH</code>. for now we can only define them in <code>ngx_lua</code>'s <code>config</code> file because nginx <code>configure</code>'s <code>--with-cc-opt</code> option hates values with double-quotes in them. sigh. This feature is used by [http://openresty.org The ngx_openresty bundle] to bundle third party Lua libraries.
-
-'''Bug fixes'''
-
-* worked-around the "stack overflow" issue while using <code>luarocks.loader</code> and disabling [[#lua_code_cache|lua_code_cache]], as described as github issue #27. thanks Patrick Crosby.
-* fixed the <code>zero size buf in output</code> alert while combining [[#lua_need_request_body|lua_need_request_body]] on + [[#access_by_lua|access_by_lua]]/[[#rewrite_by_lua|rewrite_by_lua]] + [[HttpProxyModule#proxy_pass|proxy_pass]]/[[HttpFcgiModule#fastcgi_pass|fastcgi_pass]]. thanks Liseen Wan (万珣新).
-* fixed issues with HTTP 1.0 HEAD requests.
-* made setting <code>ngx.header.HEADER</code> after sending out response headers throw out a Lua exception to help debugging issues like github issue #49. thanks Bill Donahue (ikhoyo).
-* fixed an issue regarding defining global variables in C header files: we should have defined the global <code>ngx_http_lua_exception</code> in a single compilation unit. thanks @姜大炮.
+http://openresty.org/#Changes
 
 = Test Suite =
 
@@ -3835,7 +4856,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2012, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2012, by Zhang "agentzh" Yichun (章亦春) <agentzh@gmail.com>.
+Copyright (C) 2009-2012, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>.
 
 All rights reserved.
 
@@ -3853,6 +4874,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * [http://github.com/agentzh/lua-resty-redis lua-resty-redis] library based on ngx_lua cosocket.
 * [http://github.com/agentzh/lua-resty-mysql lua-resty-mysql] library based on ngx_lua cosocket.
 * [http://github.com/agentzh/lua-resty-upload lua-resty-upload] library based on ngx_lua cosocket.
+* [http://github.com/agentzh/lua-resty-dns lua-resty-dns] library based on ngx_lua cosocket.
 * [http://github.com/agentzh/lua-resty-string lua-resty-string] library based on [http://luajit.org/ext_ffi.html LuaJIT FFI].
 * [http://openresty.org/#RoutingMySQLQueriesBasedOnURIArgs Routing requests to different MySQL queries based on URI arguments]
 * [http://openresty.org/#DynamicRoutingBasedOnRedis Dynamic Routing Based on Redis and Lua]
@@ -3866,5 +4888,5 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * [http://openresty.org The ngx_openresty bundle]
 
 = Translations =
-* [[HttpLuaModuleZh|Chinese]]
+* [[HttpLuaModuleZh|Chinese]] (still in progress)
 
diff --git a/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d b/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
new file mode 100644
index 0000000..3767f9b
--- /dev/null
+++ b/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
@@ -0,0 +1,61 @@
+provider nginx_lua {
+    probe http__lua__info(char *s);
+
+    /* lua_State *L */
+    probe http__lua__register__preload__package(void *L, u_char *pkg);
+
+    probe http__lua__req__socket__consume__preread(ngx_http_request_t *r,
+            u_char *data, size_t len);
+
+    /* lua_State *parent, lua_State *child */
+    probe http__lua__user__coroutine__create(ngx_http_request_t *r,
+            void *parent, void *child);
+
+    /* lua_State *parent, lua_State *child */
+    probe http__lua__user__coroutine__resume(ngx_http_request_t *r,
+                                             void *parent, void *child);
+
+    /* lua_State *parent, lua_State *child */
+    probe http__lua__user__coroutine__yield(ngx_http_request_t *r,
+                                            void *parent, void *child);
+
+    /* lua_State *L */
+    probe http__lua__thread__yield(ngx_http_request_t *r, void *L);
+
+    /* ngx_http_lua_socket_tcp_upstream_t *u */
+    probe http__lua__socket__tcp__send__start(ngx_http_request_t *r,
+            void *u, u_char *data, size_t len);
+
+    /* ngx_http_lua_socket_tcp_upstream_t *u */
+    probe http__lua__socket__tcp__receive__done(ngx_http_request_t *r,
+            void *u, u_char *data, size_t len);
+
+    /* ngx_http_lua_socket_tcp_upstream_t *u */
+    probe http__lua__socket__tcp__setkeepalive__buf__unread(
+            ngx_http_request_t *r, void *u, u_char *data, size_t len);
+
+    /* lua_State *creator, lua_State *newthread */
+    probe http__lua__user__thread__spawn(ngx_http_request_t *r,
+            void *creator, void *newthread);
+
+    /* lua_State *thread, ngx_http_lua_ctx_t *ctx */
+    probe http__lua__thread__delete(ngx_http_request_t *r, void *thread, void *ctx);
+
+    /* lua_State *thread */
+    probe http__lua__run__posted__thread(ngx_http_request_t *r, void *thread,
+            int status);
+
+    probe http__lua__coroutine__done(ngx_http_request_t *r, void *co,
+            int success);
+
+    /* lua_State *parent, lua_State *child */
+    probe http__lua__user__thread__wait(void *parent, void *child);
+};
+
+
+#pragma D attributes Evolving/Evolving/Common      provider nginx_lua provider
+#pragma D attributes Private/Private/Unknown       provider nginx_lua module
+#pragma D attributes Private/Private/Unknown       provider nginx_lua function
+#pragma D attributes Private/Private/Common        provider nginx_lua name
+#pragma D attributes Evolving/Evolving/Common      provider nginx_lua args
+
diff --git a/debian/modules/nginx-lua/src/api/ngx_http_lua_api.h b/debian/modules/nginx-lua/src/api/ngx_http_lua_api.h
index cb8d963..2cb6be2 100644
--- a/debian/modules/nginx-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/nginx-lua/src/api/ngx_http_lua_api.h
@@ -9,15 +9,32 @@
 #include <lua.h>
 
 
-/* Publich API for other Nginx modules */
+/* Public API for other Nginx modules */
+
+typedef struct {
+    uint8_t         type;
+
+    union {
+        int         b; /* boolean */
+        lua_Number  n; /* number */
+        ngx_str_t   s; /* string */
+    } value;
+
+} ngx_http_lua_value_t;
+
 
 lua_State * ngx_http_lua_get_global_state(ngx_conf_t *cf);
 
-ngx_http_request_t *ngx_http_lua_get_request(lua_State *L);
+ngx_http_request_t * ngx_http_lua_get_request(lua_State *L);
 
-void ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
+ngx_int_t ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
     lua_CFunction func);
 
+ngx_int_t ngx_http_lua_shared_dict_get(ngx_shm_zone_t *shm_zone,
+    u_char *key_data, size_t key_len, ngx_http_lua_value_t *value);
+
+ngx_shm_zone_t *ngx_http_lua_find_zone(u_char *name_data, size_t name_len);
+
 
 #endif /* NGX_HTTP_LUA_API_H */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c b/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
index 8affad4..710dba3 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
@@ -80,34 +80,31 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
     dd("ctx = %p", ctx);
 
     if (ctx == NULL) {
-        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+        ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
-
-        dd("setting new ctx: ctx = %p", ctx);
-
-        ctx->cc_ref = LUA_NOREF;
-        ctx->ctx_ref = LUA_NOREF;
-
-        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
     }
 
     dd("entered? %d", (int) ctx->entered_access_phase);
 
+    if (ctx->entered_access_phase) {
+        dd("calling wev handler");
+        rc = ctx->resume_handler(r);
+        dd("wev handler returns %d", (int) rc);
+
+        if (rc == NGX_ERROR || rc == NGX_DONE || rc >= NGX_OK) {
+            return rc;
+        }
+
+        return NGX_DECLINED;
+    }
+
     if (ctx->waiting_more_body) {
         dd("WAITING MORE BODY");
         return NGX_DONE;
     }
 
-    if (ctx->entered_access_phase) {
-        dd("calling wev handler");
-        rc = ngx_http_lua_wev_handler(r);
-        dd("wev handler returns %d", (int) rc);
-
-        return rc;
-    }
-
     if (llcf->force_read_body && !ctx->read_body_done) {
         r->request_body_in_single_buf = 1;
         r->request_body_in_persistent_file = 1;
@@ -140,8 +137,6 @@ ngx_http_lua_access_handler_inline(ngx_http_request_t *r)
     ngx_http_lua_loc_conf_t   *llcf;
     ngx_http_lua_main_conf_t  *lmcf;
 
-    dd("HERE");
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
@@ -205,7 +200,7 @@ ngx_http_lua_access_handler_file(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua inlined code: %s", err);
+                      "failed to load lua inlined code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -220,16 +215,19 @@ ngx_http_lua_access_handler_file(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
 {
-    int                  cc_ref;
+    int                  co_ref;
     ngx_int_t            rc;
-    lua_State           *cc;
+    lua_State           *co;
+    ngx_connection_t    *c;
     ngx_http_lua_ctx_t  *ctx;
     ngx_http_cleanup_t  *cln;
 
-    /*  {{{ new coroutine to handle request */
-    cc = ngx_http_lua_new_thread(r, L, &cc_ref);
+    ngx_http_lua_loc_conf_t     *llcf;
 
-    if (cc == NULL) {
+    /*  {{{ new coroutine to handle request */
+    co = ngx_http_lua_new_thread(r, L, &co_ref);
+
+    if (co == NULL) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "lua: failed to create new coroutine "
                       "to handle request");
@@ -238,19 +236,16 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     }
 
     /*  move code closure to new coroutine */
-    lua_xmove(L, cc, 1);
+    lua_xmove(L, co, 1);
 
     /*  set closure's env table to new coroutine's globals table */
-    lua_pushvalue(cc, LUA_GLOBALSINDEX);
-    lua_setfenv(cc, -2);
-
-    /*  save reference of code to ease forcing stopping */
-    lua_pushvalue(cc, -1);
-    lua_setglobal(cc, GLOBALS_SYMBOL_RUNCODE);
+    lua_pushvalue(co, LUA_GLOBALSINDEX);
+    lua_setfenv(co, -2);
 
     /*  save nginx request in coroutine globals table */
-    lua_pushlightuserdata(cc, r);
-    lua_setglobal(cc, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(co, &ngx_http_lua_request_key);
+    lua_pushlightuserdata(co, r);
+    lua_rawset(co, LUA_GLOBALSINDEX);
     /*  }}} */
 
     /*  {{{ initialize request context */
@@ -266,8 +261,9 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     ctx->entered_access_phase = 1;
 
-    ctx->cc = cc;
-    ctx->cc_ref = cc_ref;
+    ctx->cur_co_ctx = &ctx->entry_co_ctx;
+    ctx->cur_co_ctx->co = co;
+    ctx->cur_co_ctx->co_ref = co_ref;
 
     /*  }}} */
 
@@ -284,29 +280,47 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     }
     /*  }}} */
 
+    ctx->context = NGX_HTTP_LUA_CONTEXT_ACCESS;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->check_client_abort) {
+        r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
+
+    } else {
+        r->read_event_handler = ngx_http_block_reading;
+    }
+
     rc = ngx_http_lua_run_thread(L, r, ctx, 0);
 
     dd("returned %d", (int) rc);
 
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+    if (rc == NGX_ERROR || rc >= NGX_OK) {
         return rc;
     }
 
+    c = r->connection;
+
     if (rc == NGX_AGAIN) {
-        return NGX_DONE;
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+
+        if (rc == NGX_ERROR || rc == NGX_DONE || rc >= NGX_OK) {
+            return rc;
+        }
+
+        return NGX_DECLINED;
     }
 
     if (rc == NGX_DONE) {
         ngx_http_finalize_request(r, NGX_DONE);
-        return NGX_DONE;
-    }
 
-    if (rc >= NGX_HTTP_OK && rc < NGX_HTTP_SPECIAL_RESPONSE) {
-        return rc;
-    }
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
 
-    if (rc == NGX_OK) {
-        return NGX_OK;
+        if (rc == NGX_ERROR || rc == NGX_DONE || rc >= NGX_OK) {
+            return rc;
+        }
+
+        return NGX_DECLINED;
     }
 
     return NGX_DECLINED;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_api.c b/debian/modules/nginx-lua/src/ngx_http_lua_api.c
index 606856a..6dc503d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_api.c
@@ -4,6 +4,7 @@
 
 #include "ngx_http_lua_common.h"
 #include "api/ngx_http_lua_api.h"
+#include "ngx_http_lua_util.h"
 
 
 lua_State *
@@ -22,7 +23,8 @@ ngx_http_lua_get_request(lua_State *L)
 {
     ngx_http_request_t *r;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -30,19 +32,48 @@ ngx_http_lua_get_request(lua_State *L)
 }
 
 
-void
+ngx_int_t
 ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
                          lua_CFunction func)
 {
-    ngx_http_lua_main_conf_t *lmcf;
-    lua_State                *L;
+    lua_State                     *L;
+    ngx_http_lua_main_conf_t      *lmcf;
+    ngx_http_lua_preload_hook_t   *hook;
 
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
     L = lmcf->lua;
-    lua_getglobal(L, "package");
-    lua_getfield(L, -1, "preload");
-    lua_pushcfunction(L, func);
-    lua_setfield(L, -2, package);
-    lua_pop(L, 2);
+
+    if (L) {
+        lua_getglobal(L, "package");
+        lua_getfield(L, -1, "preload");
+        lua_pushcfunction(L, func);
+        lua_setfield(L, -2, package);
+        lua_pop(L, 2);
+
+        return NGX_OK;
+    }
+
+    /* L == NULL */
+
+    if (lmcf->preload_hooks == NULL) {
+        lmcf->preload_hooks =
+            ngx_array_create(cf->pool, 4,
+                             sizeof(ngx_http_lua_preload_hook_t));
+
+        if (lmcf->preload_hooks == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    hook = ngx_array_push(lmcf->preload_hooks);
+    if (hook == NULL) {
+        return NGX_ERROR;
+    }
+
+    hook->package = (u_char *) package;
+    hook->loader = func;
+
+    return NGX_OK;
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_args.c b/debian/modules/nginx-lua/src/ngx_http_lua_args.c
index 2ae3346..d8d616b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_args.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_args.c
@@ -25,7 +25,8 @@ ngx_http_lua_ngx_req_set_uri_args(lua_State *L) {
                 lua_gettop(L));
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -95,7 +96,8 @@ ngx_http_lua_ngx_req_get_uri_args(lua_State *L) {
         max = NGX_HTTP_LUA_MAX_ARGS;
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -152,7 +154,8 @@ ngx_http_lua_ngx_req_get_post_args(lua_State *L)
         max = NGX_HTTP_LUA_MAX_ARGS;
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
new file mode 100644
index 0000000..40e0e92
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
@@ -0,0 +1,627 @@
+/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_lua_bodyfilterby.h"
+#include "ngx_http_lua_exception.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pcrefix.h"
+#include "ngx_http_lua_time.h"
+#include "ngx_http_lua_log.h"
+#include "ngx_http_lua_regex.h"
+#include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_headers.h"
+#include "ngx_http_lua_variable.h"
+#include "ngx_http_lua_string.h"
+#include "ngx_http_lua_misc.h"
+#include "ngx_http_lua_consts.h"
+#include "ngx_http_lua_output.h"
+
+
+static void ngx_http_lua_body_filter_by_lua_env(lua_State *L,
+        ngx_http_request_t *r, ngx_chain_t *in);
+
+
+static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
+
+
+/* light user data key for the ngx_chain_t *in pointer in the
+ * Lua VM registory */
+static char ngx_http_lua_body_filter_chain_key;
+
+
+/**
+ * Set environment table for the given code closure.
+ *
+ * Before:
+ *         | code closure | <- top
+ *         |      ...     |
+ *
+ * After:
+ *         | code closure | <- top
+ *         |      ...     |
+ * */
+static void
+ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
+        ngx_chain_t *in)
+{
+    /*  set nginx request pointer to current lua thread's globals table */
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_pushlightuserdata(L, r);
+    lua_rawset(L, LUA_GLOBALSINDEX);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+    lua_pushlightuserdata(L, in);
+    lua_rawset(L, LUA_GLOBALSINDEX);
+
+    /**
+     * we want to create empty environment for current script
+     *
+     * setmetatable({}, {__index = _G})
+     *
+     * if a function or symbol is not defined in our env, __index will lookup
+     * in the global env.
+     *
+     * all variables created in the script-env will be thrown away at the end
+     * of the script run.
+     * */
+    ngx_http_lua_create_new_global_table(L, 0 /* narr */, 1 /* nrec */);
+
+    /*  {{{ make new env inheriting main thread's globals table */
+    lua_newtable(L);    /*  the metatable for the new env */
+    lua_pushvalue(L, LUA_GLOBALSINDEX);
+    lua_setfield(L, -2, "__index");
+    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
+    /*  }}} */
+
+    lua_setfenv(L, -2);    /*  set new running env for the code closure */
+}
+
+
+ngx_int_t
+ngx_http_lua_body_filter_by_chunk(lua_State *L, ngx_http_request_t *r,
+        ngx_chain_t *in)
+{
+    ngx_int_t        rc;
+    u_char          *err_msg;
+    size_t           len;
+#if (NGX_PCRE)
+    ngx_pool_t      *old_pool;
+#endif
+
+    dd("initialize nginx context in Lua VM, code chunk at stack top  sp = 1");
+    ngx_http_lua_body_filter_by_lua_env(L, r, in);
+
+#if (NGX_PCRE)
+    /* XXX: work-around to nginx regex subsystem */
+    old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
+#endif
+
+    lua_pushcfunction(L, ngx_http_lua_traceback);
+    lua_insert(L, 1);  /* put it under chunk and args */
+
+    dd("protected call user code");
+    rc = lua_pcall(L, 0, 1, 1);
+
+    lua_remove(L, 1);  /* remove traceback function */
+
+#if (NGX_PCRE)
+    /* XXX: work-around to nginx regex subsystem */
+    ngx_http_lua_pcre_malloc_done(old_pool);
+#endif
+
+    if (rc != 0) {
+
+        /*  error occured */
+        err_msg = (u_char *) lua_tolstring(L, -1, &len);
+
+        if (err_msg == NULL) {
+            err_msg = (u_char *) "unknown reason";
+            len = sizeof("unknown reason") - 1;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "failed to run body_filter_by_lua*: %*s", len, err_msg);
+
+        lua_settop(L, 0);    /*  clear remaining elems on stack */
+
+        return NGX_ERROR;
+    }
+
+    /* rc == 0 */
+
+    rc = (ngx_int_t) lua_tointeger(L, -1);
+
+    dd("got return value: %d", (int) rc);
+
+    lua_settop(L, 0);
+
+    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_lua_body_filter_inline(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    lua_State                   *L;
+    ngx_int_t                    rc;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf;
+    char                        *err;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    L = lmcf->lua;
+
+    /*  load Lua inline script (w/ cache) sp = 1 */
+    rc = ngx_http_lua_cache_loadbuffer(L, llcf->body_filter_src.value.data,
+            llcf->body_filter_src.value.len, llcf->body_filter_src_key,
+            "body_filter_by_lua", &err, llcf->enable_code_cache ? 1 : 0);
+
+    if (rc != NGX_OK) {
+        if (err == NULL) {
+            err = "unknown error";
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                "Failed to load Lua inlined code: %s", err);
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    rc = ngx_http_lua_body_filter_by_chunk(L, r, in);
+
+    dd("body filter by chunk returns %d", (int) rc);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_lua_body_filter_file(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    lua_State                       *L;
+    ngx_int_t                        rc;
+    u_char                          *script_path;
+    ngx_http_lua_main_conf_t        *lmcf;
+    ngx_http_lua_loc_conf_t         *llcf;
+    char                            *err;
+    ngx_str_t                        eval_src;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    /* Eval nginx variables in code path string first */
+    if (ngx_http_complex_value(r, &llcf->body_filter_src, &eval_src)
+            != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    script_path = ngx_http_lua_rebase_path(r->pool, eval_src.data,
+            eval_src.len);
+
+    if (script_path == NULL) {
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    L = lmcf->lua;
+
+    /*  load Lua script file (w/ cache)        sp = 1 */
+    rc = ngx_http_lua_cache_loadfile(L, script_path,
+            llcf->body_filter_src_key, &err, llcf->enable_code_cache ? 1 : 0);
+
+    if (rc != NGX_OK) {
+        if (err == NULL) {
+            err = "unknown error";
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "failed to load Lua inlined code: %s", err);
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /*  make sure we have a valid code chunk */
+    assert(lua_isfunction(L, -1));
+
+    rc = ngx_http_lua_body_filter_by_chunk(L, r, in);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_http_lua_loc_conf_t     *llcf;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_int_t                    rc;
+    uint8_t                      old_context;
+    ngx_http_cleanup_t          *cln;
+    ngx_http_lua_main_conf_t    *lmcf;
+    lua_State                   *L;
+    ngx_chain_t                 *out;
+    ngx_buf_tag_t                tag;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua body filter for user lua code, uri \"%V\"", &r->uri);
+
+    if (in == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->body_filter_handler == NULL) {
+        dd("no body filter handler found");
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    dd("ctx = %p", ctx);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ctx->cleanup == NULL) {
+        cln = ngx_http_cleanup_add(r, 0);
+        if (cln == NULL) {
+            return NGX_ERROR;
+        }
+
+        cln->handler = ngx_http_lua_request_cleanup;
+        cln->data = r;
+        ctx->cleanup = &cln->handler;
+    }
+
+    old_context = ctx->context;
+    ctx->context = NGX_HTTP_LUA_CONTEXT_BODY_FILTER;
+
+    dd("calling body filter handler");
+    rc = llcf->body_filter_handler(r, in);
+
+    dd("calling body filter handler returned %d", (int) rc);
+
+    ctx->context = old_context;
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    L = lmcf->lua;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    out = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (in == out) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    /* in != out */
+    rc = ngx_http_next_body_filter(r, out);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    tag = (ngx_buf_tag_t) &ngx_http_lua_module;
+
+#if nginx_version >= 1001004
+    ngx_chain_update_chains(r->pool,
+#else
+    ngx_chain_update_chains(
+#endif
+                            &ctx->free_bufs, &ctx->busy_bufs, &out, tag);
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_http_lua_body_filter_init()
+{
+    dd("calling body filter init");
+    ngx_http_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_lua_body_filter;
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_body_filter_param_get(lua_State *L)
+{
+    u_char              *data, *p;
+    size_t               size;
+    ngx_chain_t         *cl;
+    ngx_buf_t           *b;
+    int                  idx;
+    ngx_chain_t         *in;
+
+    idx = luaL_checkint(L, 2);
+
+    dd("index: %d", idx);
+
+    if (idx != 1 && idx != 2) {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    in = lua_touserdata(L, -1);
+
+    if (in == NULL) {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    if (idx == 2) {
+        /* asking for the eof argument */
+
+        for (cl = in; cl; cl = cl->next) {
+            if (cl->buf->last_buf) {
+                lua_pushboolean(L, 1);
+                return 1;
+            }
+        }
+
+        lua_pushboolean(L, 0);
+        return 1;
+    }
+
+    /* idx == 1 */
+
+    if (in == NULL) {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    size = 0;
+
+    if (in->next == NULL) {
+
+        dd("seen only single buffer");
+
+        b = in->buf;
+        lua_pushlstring(L, (char *) b->pos, b->last - b->pos);
+        return 1;
+    }
+
+    dd("seen multiple buffers");
+
+    for (cl = in; cl; cl = cl->next) {
+        b = cl->buf;
+
+        size += b->last - b->pos;
+
+        if (b->last_buf) {
+            break;
+        }
+    }
+
+    data = (u_char *) lua_newuserdata(L, size);
+
+    for (p = data, cl = in; cl; cl = cl->next) {
+        b = cl->buf;
+        p = ngx_copy(p, b->pos, b->last - b->pos);
+
+        if (b->last_buf) {
+            break;
+        }
+    }
+
+    lua_pushlstring(L, (char *) data, size);
+    return 1;
+}
+
+
+int
+ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
+        ngx_http_lua_ctx_t *ctx)
+{
+    int                      type;
+    int                      idx;
+    u_char                  *data;
+    size_t                   size;
+    unsigned                 last;
+    ngx_chain_t             *cl;
+    ngx_chain_t             *in;
+    ngx_buf_tag_t            tag;
+
+    idx = luaL_checkint(L, 2);
+
+    dd("index: %d", idx);
+
+    if (idx != 1 && idx != 2) {
+        return luaL_error(L, "bad index: %d", idx);
+    }
+
+    if (idx == 2) {
+        /* overwriting the eof flag */
+        last = lua_toboolean(L, 3);
+
+        lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+        lua_rawget(L, LUA_GLOBALSINDEX);
+        in = lua_touserdata(L, -1);
+
+        if (last) {
+            if (in) {
+                for (cl = in; cl; cl = cl->next) {
+                    if (cl->next == NULL) {
+                        cl->buf->last_buf = 1;
+                        break;
+                    }
+                }
+
+            } else {
+                tag = (ngx_buf_tag_t) &ngx_http_lua_module;
+
+                cl = ngx_http_lua_chains_get_free_buf(r->connection->log,
+                                                      r->pool, &ctx->free_bufs,
+                                                      0, tag);
+
+                if (cl == NULL) {
+                    return luaL_error(L, "out of memory");
+                }
+
+                cl->buf->last_buf = 1;
+
+                lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+                lua_pushlightuserdata(L, cl);
+                lua_rawset(L, LUA_GLOBALSINDEX);
+            }
+
+        } else {
+            /* last == 0 */
+
+            if (in) {
+                for (size = 0, cl = in; cl; cl = cl->next) {
+                    if (cl->buf->last_buf) {
+                        cl->buf->last_buf = 0;
+                    }
+
+                    size += cl->buf->last - cl->buf->pos;
+                }
+
+                if (size == 0) {
+                    lua_pushlightuserdata(L,
+                                          &ngx_http_lua_body_filter_chain_key);
+                    lua_pushlightuserdata(L, NULL);
+                    lua_rawset(L, LUA_GLOBALSINDEX);
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    /* idx == 1, overwriting the chunk data */
+
+    type = lua_type(L, 3);
+
+    switch (type) {
+    case LUA_TSTRING:
+    case LUA_TNUMBER:
+        data = (u_char *) lua_tolstring(L, 3, &size);
+        break;
+
+    case LUA_TNIL:
+        /* discard the buffers */
+        lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key); /* key */
+        lua_pushvalue(L, -1); /* key key */
+        lua_rawget(L, LUA_GLOBALSINDEX); /* key val */
+        in = lua_touserdata(L, -1);
+        lua_pop(L, 1); /* key */
+
+        for (cl = in; cl; cl = cl->next) {
+            dd("mark the buf as consumed: %d", (int) ngx_buf_size(cl->buf));
+            cl->buf->pos = cl->buf->last;
+        }
+
+        lua_pushlightuserdata(L, NULL); /* key val */
+        lua_rawset(L, LUA_GLOBALSINDEX);
+        return 0;
+
+    case LUA_TTABLE:
+        size = ngx_http_lua_calc_strlen_in_table(L, 3 /* index */, 3 /* arg */,
+                                                 1 /* strict */);
+        data = NULL;
+        break;
+
+    default:
+        return luaL_error(L, "bad chunk data type: %s",
+                          lua_typename(L, type));
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    in = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    last = 0;
+    for (cl = in; cl; cl = cl->next) {
+        if (cl->buf->last_buf) {
+            last = 1;
+        }
+
+        dd("mark the buf as consumed: %d", (int) ngx_buf_size(cl->buf));
+        cl->buf->pos = cl->buf->last;
+    }
+
+    if (size == 0) {
+        if (last) {
+            if (in) {
+                in->buf->last_buf = 1;
+
+            } else {
+
+                tag = (ngx_buf_tag_t) &ngx_http_lua_module;
+
+                cl = ngx_http_lua_chains_get_free_buf(r->connection->log,
+                                                      r->pool, &ctx->free_bufs,
+                                                      0, tag);
+
+                if (cl == NULL) {
+                    return luaL_error(L, "out of memory");
+                }
+
+                cl->buf->last_buf = 1;
+
+                lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+                lua_pushlightuserdata(L, cl);
+                lua_rawset(L, LUA_GLOBALSINDEX);
+            }
+        }
+
+        return 0;
+    }
+
+    tag = (ngx_buf_tag_t) &ngx_http_lua_module;
+
+    cl = ngx_http_lua_chains_get_free_buf(r->connection->log, r->pool,
+                                          &ctx->free_bufs, size, tag);
+    if (cl == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    if (type == LUA_TTABLE) {
+        cl->buf->last = ngx_http_lua_copy_str_in_table(L, 3, cl->buf->last);
+
+    } else {
+        cl->buf->last = ngx_copy(cl->buf->pos, data, size);
+    }
+
+    cl->buf->last_buf = last;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_body_filter_chain_key);
+    lua_pushlightuserdata(L, cl);
+    lua_rawset(L, LUA_GLOBALSINDEX);
+    return 0;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h
new file mode 100644
index 0000000..8aa2834
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h
@@ -0,0 +1,31 @@
+/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
+
+#ifndef NGX_HTTP_LUA_BODYFILTERBY_H
+#define NGX_HTTP_LUA_BODYFILTERBY_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+extern ngx_http_output_body_filter_pt ngx_http_lua_next_filter_body_filter;
+
+
+ngx_int_t ngx_http_lua_body_filter_init(void);
+
+ngx_int_t ngx_http_lua_body_filter_by_chunk(lua_State *L,
+        ngx_http_request_t *r, ngx_chain_t *in);
+
+ngx_int_t ngx_http_lua_body_filter_inline(ngx_http_request_t *r,
+        ngx_chain_t *in);
+
+ngx_int_t ngx_http_lua_body_filter_file(ngx_http_request_t *r,
+        ngx_chain_t *in);
+
+int ngx_http_lua_body_filter_param_get(lua_State *L);
+
+int ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
+        ngx_http_lua_ctx_t *ctx);
+
+
+#endif /* NGX_HTTP_LUA_BODYFILTERBY_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_cache.c b/debian/modules/nginx-lua/src/ngx_http_lua_cache.c
index ddd8262..23a1f2c 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_cache.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_cache.c
@@ -32,7 +32,8 @@ static ngx_int_t
 ngx_http_lua_cache_load_code(lua_State *L, const char *key)
 {
     /*  get code cache table */
-    lua_getfield(L, LUA_REGISTRYINDEX, LUA_CODE_CACHE_KEY);    /*  sp++ */
+    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);    /*  sp++ */
 
     dd("Code cache table to load: %p", lua_topointer(L, -1));
 
@@ -85,7 +86,8 @@ ngx_http_lua_cache_store_code(lua_State *L, const char *key)
     int rc;
 
     /*  get code cache table */
-    lua_getfield(L, LUA_REGISTRYINDEX, LUA_CODE_CACHE_KEY); /* closure cache */
+    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
 
     dd("Code cache table to store: %p", lua_topointer(L, -1));
 
@@ -160,7 +162,7 @@ ngx_http_lua_cache_loadbuffer(lua_State *L, const u_char *src, size_t src_len,
     rc = ngx_http_lua_cache_store_code(L, (char *) cache_key);
 
     if (rc != NGX_OK) {
-        *err = "fail to genearte new closutre from the closutre factory";
+        *err = "fail to generate new closure from the closure factory";
         return NGX_ERROR;
     }
 
@@ -232,7 +234,7 @@ ngx_http_lua_cache_loadfile(lua_State *L, const u_char *script,
         rc = ngx_http_lua_cache_store_code(L, (char *) cache_key);
 
         if (rc != NGX_OK) {
-            *err = "fail to genearte new closutre from the closutre factory";
+            *err = "fail to generate new closure from the closure factory";
             return NGX_ERROR;
         }
 
@@ -281,17 +283,19 @@ ngx_http_lua_clear_package_loaded(lua_State *L)
 
         switch (len) {
         case 2:
-            if (ngx_strncmp(p, "os", sizeof("os") - 1) == 0) {
+            if (p[0] == 'o' && p[1] == 's') {
                 goto done;
             }
 
-            if (ngx_strncmp(p, "io", sizeof("io") - 1) == 0) {
+            if (p[0] == 'i' && p[1] == 'o') {
                 goto done;
             }
 
+#if 0
             if (ngx_strncmp(p, "_G", sizeof("_G") - 1) == 0) {
                 goto done;
             }
+#endif
 
             break;
 
@@ -379,5 +383,8 @@ done:
 
     /* package loaded */
     lua_pop(L, 2);
+
+    lua_newtable(L);
+    lua_setglobal(L, "_G");
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.c b/debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.c
index cc514a8..cb866b4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.c
@@ -38,23 +38,33 @@ ngx_http_lua_capture_filter_init(ngx_conf_t *cf)
 static ngx_int_t
 ngx_http_lua_capture_header_filter(ngx_http_request_t *r)
 {
-    ngx_http_post_subrequest_t      *ps;
+    ngx_http_post_subrequest_t      *psr;
     ngx_http_lua_ctx_t              *old_ctx;
     ngx_http_lua_ctx_t              *ctx;
 
+    ngx_http_lua_post_subrequest_data_t      *psr_data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua capture header filter, uri \"%V\"", &r->uri);
+
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
     dd("old ctx: %p", ctx);
 
     if (ctx == NULL || ! ctx->capture) {
-        ps = r->post_subrequest;
-        if (ps != NULL && ps->handler == ngx_http_lua_post_subrequest &&
-                ps->data != NULL)
+
+        psr = r->post_subrequest;
+
+        if (psr != NULL
+            && psr->handler == ngx_http_lua_post_subrequest
+            && psr->data != NULL)
         {
             /* the lua ctx has been cleared by ngx_http_internal_redirect,
              * resume it from the post_subrequest data
              */
-            old_ctx = ps->data;
+            psr_data = psr->data;
+
+            old_ctx = psr_data->ctx;
 
             if (ctx == NULL) {
                 ctx = old_ctx;
@@ -62,19 +72,19 @@ ngx_http_lua_capture_header_filter(ngx_http_request_t *r)
 
             } else {
                 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                        "lua restoring ctx with capture %d, index %d",
-                        old_ctx->capture, old_ctx->index);
+                               "lua restoring ctx with capture %d, index %d",
+                               old_ctx->capture, old_ctx->index);
 
                 ctx->capture = old_ctx->capture;
                 ctx->index = old_ctx->index;
-                ps->data = ctx;
+                psr_data->ctx = ctx;
             }
         }
     }
 
     if (ctx && ctx->capture) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua capturing response body");
+                       "lua capturing response body");
 
         /* force subrequest response body buffer in memory */
         r->filter_need_in_memory = 1;
@@ -93,6 +103,9 @@ ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_http_lua_ctx_t              *ctx;
     ngx_http_lua_ctx_t              *pr_ctx;
 
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua capture body filter, uri \"%V\"", &r->uri);
+
     if (in == NULL) {
         return ngx_http_lua_next_body_filter(r, NULL);
     }
@@ -107,13 +120,15 @@ ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     if (ctx->run_post_subrequest) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua body filter skipped because post subrequest already run");
+                       "lua body filter skipped because post subrequest "
+                       "already run");
         return NGX_OK;
     }
 
     if (r->parent == NULL) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua body filter skipped because no parent request found");
+                       "lua body filter skipped because no parent request "
+                       "found");
 
         return NGX_ERROR;
     }
@@ -124,8 +139,8 @@ ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua capture body filter capturing response body, uri \"%V\"",
-            &r->uri);
+                   "lua capture body filter capturing response body, uri "
+                   "\"%V\"", &r->uri);
 
     rc = ngx_http_lua_add_copy_chain(r, pr_ctx, &ctx->body, in);
     if (rc != NGX_OK) {
@@ -134,6 +149,6 @@ ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     ngx_http_lua_discard_bufs(r->pool, in);
 
-    return ngx_http_lua_flush_postponed_outputs(r);
+    return NGX_OK;
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c b/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
index acadbfd..8e30d6f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
@@ -1,15 +1,266 @@
 /* vim:set ft=c ts=4 sw=4 et fdm=marker: */
 
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
 #include <nginx.h>
 #include "ngx_http_lua_clfactory.h"
 
 
+/*
+ * taken from chaoslawful:
+ * Lua bytecode header        Luajit bytecode header
+ * --------------              --------------
+ * |  \033Lua   | 0-3          |  \033LJ    | 0-2
+ * --------------              --------------
+ * |    LuaC    | 4            |  bytecode  | 3
+ * |   Version  |              |   version  |
+ * --------------              --------------
+ * |    LuaC    | 5            |  misc flag | 4 [F|S|B]
+ * |   Format   |              --------------
+ * --------------              |  chunkname | ULEB128 var-len
+ * |   Endian   | 6            |     len    | encoded uint32
+ * --------------              --------------
+ * |   size of  | 7            |  chunkname |
+ * |     int    |              |  str no \0 |
+ * --------------              --------------
+ * |   size of  | 8
+ * |    size_t  |
+ * --------------
+ * |   size of  | 9
+ * | instruction|
+ * --------------
+ * |   size of  | 10
+ * |   number   |
+ * --------------
+ * |   number   | 11
+ * |   is int?  |
+ * --------------
+*/
+
+
+/*
+ * CLOSURE 0 0 RETURN 0 2 RETURN 0 1
+ * length(Instruction) = 4 or 8
+ * little endian or big endian
+*/
+#define    LUA_LITTLE_ENDIAN_4BYTES_CODE                                \
+    "\x24\x00\x00\x00\x1e\x00\x00\x01\x1e\x00\x80\x00"
+#define    LUA_LITTLE_ENDIAN_8BYTES_CODE                                \
+    "\x24\x00\x00\x00\x00\x00\x00\x00\x1e\x00\x00\x01"                  \
+    "\x00\x00\x00\x00\x1e\x00\x80\x00\x00\x00\x00\x00"
+#define    LUA_BIG_ENDIAN_4BYTES_CODE                                   \
+    "\x00\x00\x00\x24\x01\x00\x00\x1e\x00\x08\x00\x1e"
+#define    LUA_BIG_ENDIAN_8BYTES_CODE                                   \
+    "\x00\x00\x00\x00\x00\x00\x00\x24\x00\x00\x00\x00"                  \
+    "\x01\x00\x00\x1e\x00\x00\x00\x00\x00\x08\x00\x1e"
+#define    LUA_LITTLE_ENDIAN_4BYTES_CODE_LEN        (4 + 4 + 4)
+#define    LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN        (8 + 8 + 8)
+#define    LUA_BIG_ENDIAN_4BYTES_CODE_LEN           (4 + 4 + 4)
+#define    LUA_BIG_ENDIAN_8BYTES_CODE_LEN           (8 + 8 + 8)
+#define    LUAC_HEADERSIZE         12
+#define    LUAC_VERSION            0x51
+
+/*
+ * taken from chaoslawful:
+ *  Lua Proto
+ * ---------------------
+ * | String            | Can be empty string
+ * | [source]          | (stripped or internal function)
+ * ---------------------
+ * | Int               | At which line this function is defined
+ * | [linedefined]     |
+ * ---------------------
+ * | Int               | At while line this function definition ended
+ * | [lastlinedefined] |
+ * ---------------------
+ * | Char              | Number of upvalues referenced by this function
+ * | [nups]            |
+ * ---------------------
+ * | Char              | Number of paramters of this function
+ * | [numparams]       |
+ * ---------------------
+ * | Char              | Does this function has variable number of arguments?
+ * | [is_var_arg]      | main function always set to VARARG_ISVARARG (2)
+ * ---------------------
+ * | Char              | Maximum stack size this function used
+ * | [maxstacksize]    | Intially set to 2
+ * ---------------------
+ * | Vector(instr)     | Code instructions of this function
+ * | [code]            |
+ * ---------------------
+ * | Int               | Number of constants referenced by this function
+ * | [sizek]           |
+ * ---------------------
+ * | Char              | ------------------------------------
+ * | type of [k[i]]    |  The type and content of constants |
+ * ---------------------                                    |-> repeat for i in
+ * | Char if boolean   |  No content part if type is NIL    |   [1..sizek]
+ * | Number if number  | ------------------------------------
+ * | String if string  |
+ * ---------------------
+ * | Int               | Number of internal functions
+ * | [sizep]           |
+ * ---------------------
+ * | Function          | -> repeat for i in [1..sizep]
+ * | at [p[i]]         |
+ * ---------------------
+ * | Vector            | Debug lineinfo vector
+ * | [lineinfo]        | Empty vector here if dubug info is stripped
+ * ---------------------
+ * | Int               | Number of local variable in this function
+ * | [sizelocvars]     | 0 if debug info is stripped
+ * ---------------------
+ * | String            | ------------------------------------
+ * | [locvars[i]]      |  Name of local var i               |
+ * |  .varname]        |                                    |
+ * ---------------------                                    |
+ * | Int               |  instruction counter               |
+ * | [locvars[i]]      |  where lcoal var i start to be     |-> repeat for i in
+ * |  .startpc]        |  referenced                        |  [0..sizelocvars]
+ * ---------------------                                    |
+ * | Int               |  instruction counter, where local  |
+ * | [locvars[i]]      |  var i ceased to be referenced     |
+ * |  .endpc]          | ------------------------------------
+ * ---------------------
+ * | Int               | Number of upvalues referenced by this function,
+ * | [sizeupvalues]    | 0 if stripped
+ * ---------------------
+ * | String            | -> repeat for i in[0..sizeupvalues]
+ * | [upvalues[i]]     |
+ * ---------------------
+*/
+
+#define    POS_SOURCE_STR_LEN      LUAC_HEADERSIZE
+#define    POS_START_LINE          (POS_SOURCE_STR_LEN + sizeof(size_t))
+#define    POS_LAST_LINE           (POS_START_LINE + sizeof(int))
+#define    POS_NUM_OF_UPVS         (POS_LAST_LINE + sizeof(int))
+#define    POS_NUM_OF_PARA         (POS_NUM_OF_UPVS + sizeof(char))
+#define    POS_IS_VAR_ARG          (POS_NUM_OF_PARA + sizeof(char))
+#define    POS_MAX_STACK_SIZE      (POS_IS_VAR_ARG + sizeof(char))
+#define    POS_NUM_OF_INST         (POS_MAX_STACK_SIZE +sizeof(char))
+#define    POS_BYTECODE            (POS_NUM_OF_INST + sizeof(int))
+#define    MAX_BEGIN_CODE_SIZE                                              \
+    (POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN                       \
+    + sizeof(int) + sizeof(int))
+#define    MAX_END_CODE_SIZE       (sizeof(int) + sizeof(int) + sizeof(int))
+
+/*
+ * taken from chaoslawful:
+ * Luajit bytecode format
+ * ---------------------
+ * | HEAD              | Luajit bytecode head
+ * ---------------------
+ * | Internal          | All internal functions
+ * | functions         |
+ * ---------------------
+ * | ULEB128           | Rest data total length of this function
+ * | [Date len of      | (not include itself)
+ * |  this function]   |
+ * ---------------------
+ * | Char              | F(ffi) | V(vararg)| C(has internal funcs)
+ * | [func flag]       |
+ * ---------------------
+ * | Char              | Number of paramters of this function
+ * | [numparams]       |
+ * ---------------------
+ * | Char              |
+ * | [framesize]       |
+ * ---------------------
+ * | Char              | Number of upvalues referenced by this function
+ * | [sizeupvalues]    |
+ * ---------------------
+ * | ULEB128           | Number of collectable constants referenced
+ * | [sizekgc]         | by this function
+ * ---------------------
+ * | ULEB128           | Number of lua number constants referenced
+ * | [sizekn]          | by this function
+ * ---------------------
+ * | ULEB128           | Number of bytecode instructions of this function
+ * | [sizebc]m1        | minus 1 to omit the BC_FUNCV/BC_FUNCF header bytecode
+ * ---------------------
+ * | ULEB128           |
+ * | [size of dbg      | Size of debug lineinfo map, available when not stripped
+ * |  lineinfo]        |
+ * ---------------------
+ * | ULEB128           | Available when not stripped
+ * | [firstline]       | The first line of this function's definition
+ * ---------------------
+ * | ULEB128           | Available when not stripped
+ * | [numline]         | The number of lines of this function's definition
+ * ---------------------
+ * | [bytecode]        | Bytecode instructions of this function
+ * ---------------------
+ * |[upvalue ref slots]| [sizeupvalues] * 2
+ * ---------------------
+ * | [collectable      | [sizekgc] elems, variable length
+ * |  constants]       |
+ * ---------------------
+ * | [lua number       | [sizekn] elems, variable length
+ * |  constants]       |
+ * ---------------------
+ * | [debug lineinfo   | Length is the calculated size of debug lineinfo above
+ * |                   | Only available if not stripped
+ * ---------------------
+ * | Char              |
+ * | [\x00]            | Footer
+ * ---------------------
+*/
+
+/* bytecode for luajit */
+#define    LJ_LITTLE_ENDIAN_CODE_STRIPPED                               \
+    "\x14\x03\x00\x01\x00\x01\x00\x03"                                  \
+    "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                  \
+    "\x00\x00"
+#define    LJ_BIG_ENDIAN_CODE_STRIPPED                                  \
+    "\x14\x03\x00\x01\x00\x01\x00\x03"                                  \
+    "\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48"                  \
+    "\x00\x00"
+#define    LJ_LITTLE_ENDIAN_CODE                                        \
+    "\x15\x03\x00\x01\x00\x01\x00\x03\x00"                              \
+    "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                  \
+    "\x00\x00"
+#define    LJ_BIG_ENDIAN_CODE                                           \
+    "\x15\x03\x00\x01\x00\x01\x00\x03\x00"                              \
+    "\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48"                  \
+    "\x00\x00"
+
+#define    LJ_CODE_LEN              23
+#define    LJ_CODE_LEN_STRIPPED     22
+#define    LJ_HEADERSIZE            5
+#define    LJ_BCDUMP_F_BE           0x01
+#define    LJ_BCDUMP_F_STRIP        0x02
+#define    LJ_BCDUMP_VERSION        1
+#define    LJ_SIGNATURE             "\x1b\x4c\x4a"
+
+
+typedef enum {
+    NGX_LUA_TEXT_FILE,
+    NGX_LUA_BT_LUA,
+    NGX_LUA_BT_LJ
+} clfactory_file_type_e;
+
+
 typedef struct {
-    int sent_begin;
-    int sent_end;
-    int extraline;
-    FILE *f;
-    char buff[LUAL_BUFFERSIZE];
+    clfactory_file_type_e file_type;
+    int         sent_begin;
+    int         sent_end;
+    int         extraline;
+    FILE       *f;
+    size_t      begin_code_len;
+    size_t      end_code_len;
+    size_t      rest_len;
+    union {
+        char   *ptr;
+        char    str[MAX_BEGIN_CODE_SIZE];
+    }           begin_code;
+    union {
+        char   *ptr;
+        char    str[MAX_END_CODE_SIZE];
+    }           end_code;
+    char        buff[LUAL_BUFFERSIZE];
 } clfactory_file_ctx_t;
 
 
@@ -18,7 +269,6 @@ typedef struct {
     int         sent_end;
     const char *s;
     size_t      size;
-
 } clfactory_buffer_ctx_t;
 
 
@@ -27,19 +277,264 @@ static int clfactory_errfile(lua_State *L, const char *what, int fname_index);
 static const char *clfactory_getS(lua_State *L, void *ud, size_t *size);
 
 
+int
+ngx_http_lua_clfactory_bytecode_prepare(lua_State *L, clfactory_file_ctx_t *lf,
+    int fname_index)
+{
+    int                 x = 1, size_of_int, size_of_size_t, little_endian,
+                        size_of_inst, version, stripped;
+    static int          num_of_inst = 3, num_of_inter_func = 1;
+    const char         *filename, *emsg, *serr, *bytecode;
+    size_t              size, bytecode_len;
+    ngx_file_info_t     fi;
+
+    serr = NULL;
+
+    *lf->begin_code.str = LUA_SIGNATURE[0];
+
+    if (lf->file_type == NGX_LUA_BT_LJ) {
+        size = fread(lf->begin_code.str + 1, 1, LJ_HEADERSIZE - 1, lf->f);
+
+        if (size != LJ_HEADERSIZE - 1) {
+            serr = strerror(errno);
+            emsg = "cannot read header";
+            goto error;
+        }
+
+        version = *(lf->begin_code.str + 3);
+
+        if (ngx_memcmp(lf->begin_code.str, LJ_SIGNATURE,
+                       sizeof(LJ_SIGNATURE) - 1)
+            || version != LJ_BCDUMP_VERSION)
+        {
+            emsg = "bad byte-code header";
+            goto error;
+        }
+
+#if defined(DDEBUG) && (DDEBUG)
+        {
+        dd("==LJ_BT_HEADER==");
+        size_t i;
+        for (i = 0; i < LJ_HEADERSIZE; i++) {
+            dd("%ld: 0x%02X", i, (unsigned)(u_char)lf->begin_code.str[i]);
+        }
+        dd("==LJ_BT_HEADER_END==");
+        }
+#endif
+
+        lf->begin_code_len = LJ_HEADERSIZE;
+        little_endian = !((*(lf->begin_code.str + 4)) & LJ_BCDUMP_F_BE);
+        stripped = (*(lf->begin_code.str + 4)) & LJ_BCDUMP_F_STRIP;
+
+        if (stripped) {
+            if (little_endian) {
+                lf->end_code.ptr = LJ_LITTLE_ENDIAN_CODE_STRIPPED;
+
+            } else {
+                lf->end_code.ptr = LJ_BIG_ENDIAN_CODE_STRIPPED;
+            }
+
+            lf->end_code_len = LJ_CODE_LEN_STRIPPED;
+
+        } else {
+            if (little_endian) {
+                lf->end_code.ptr = LJ_LITTLE_ENDIAN_CODE;
+
+            } else {
+                lf->end_code.ptr = LJ_BIG_ENDIAN_CODE;
+            }
+
+            lf->end_code_len = LJ_CODE_LEN;
+        }
+
+        if (ngx_fd_info(fileno(lf->f), &fi) == NGX_FILE_ERROR) {
+            serr = strerror(errno);
+            emsg = "cannot fstat";
+            goto error;
+        }
+
+        lf->rest_len = ngx_file_size(&fi) - LJ_HEADERSIZE;
+
+#if defined(DDEBUG) && (DDEBUG)
+        {
+        size_t i = 0;
+        dd("==LJ_END_CODE: %ld rest_len: %ld==", lf->end_code_len,
+           lf->rest_len);
+        for (i = 0; i < lf->end_code_len; i++) {
+            dd("%ld: 0x%02X", i, (unsigned) ((u_char) lf->end_code.ptr[i]));
+        }
+        dd("==LJ_END_CODE_END==");
+        }
+#endif
+
+    } else {
+        size = fread(lf->begin_code.str + 1, 1, LUAC_HEADERSIZE - 1, lf->f);
+
+        if (size != LUAC_HEADERSIZE - 1) {
+            serr = strerror(errno);
+            emsg = "cannot read header";
+            goto error;
+        }
+
+        version = *(lf->begin_code.str + 4);
+        little_endian = *(lf->begin_code.str + 6);
+        size_of_int = *(lf->begin_code.str + 7);
+        size_of_size_t = *(lf->begin_code.str + 8);
+        size_of_inst = *(lf->begin_code.str + 9);
+
+#if defined(DDEBUG) && (DDEBUG)
+        {
+        dd("==LUA_BT_HEADER==");
+        size_t i;
+        for (i = 0; i < LUAC_HEADERSIZE; i++) {
+            dd("%ld, 0x%02X", i, (unsigned)(u_char)lf->begin_code.str[i]);
+        }
+        dd("==LUA_BT_HEADER_END==");
+        }
+#endif
+
+        if (ngx_memcmp(lf->begin_code.str, LUA_SIGNATURE,
+                       sizeof(LUA_SIGNATURE) -1)
+            || version != LUAC_VERSION
+            || little_endian != (int) (*(char *) &x)
+            || size_of_int != sizeof(int)
+            || size_of_size_t != sizeof(size_t)
+            || (size_of_inst != 4 && size_of_inst != 8))
+        {
+            emsg = "bad byte-code header";
+            goto error;
+        }
+
+        /* clear the following fields to zero:
+         * - source string length
+         * - start line
+         * - last line
+         */
+        ngx_memzero(lf->begin_code.str + POS_SOURCE_STR_LEN,
+                    sizeof(size_t) + sizeof(int) * 2);
+        /* number of upvalues */
+        *(lf->begin_code.str + POS_NUM_OF_UPVS) = 0;
+        /* number of paramters */
+        *(lf->begin_code.str + POS_NUM_OF_PARA) = 0;
+        /* is var-argument function? */
+        *(lf->begin_code.str + POS_IS_VAR_ARG) = 2;
+        /* max stack size */
+        *(lf->begin_code.str + POS_MAX_STACK_SIZE) = 2;
+        /* number of bytecode instructions */
+        ngx_memcpy(lf->begin_code.str + POS_NUM_OF_INST, &num_of_inst,
+                   sizeof(int));
+
+        lf->begin_code_len = POS_BYTECODE;
+
+        if (little_endian) {
+            if (size_of_inst == 4) {
+                bytecode = LUA_LITTLE_ENDIAN_4BYTES_CODE;
+                bytecode_len = LUA_LITTLE_ENDIAN_4BYTES_CODE_LEN;
+
+            } else {
+                bytecode = LUA_LITTLE_ENDIAN_8BYTES_CODE;
+                bytecode_len = LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN;
+            }
+
+        } else {
+            if (size_of_inst == 4) {
+                bytecode = LUA_BIG_ENDIAN_4BYTES_CODE;
+                bytecode_len = LUA_BIG_ENDIAN_4BYTES_CODE_LEN;
+
+            } else {
+                bytecode = LUA_BIG_ENDIAN_8BYTES_CODE;
+                bytecode_len = LUA_BIG_ENDIAN_8BYTES_CODE_LEN;
+            }
+        }
+
+        /* bytecode */
+        ngx_memcpy(lf->begin_code.str + POS_BYTECODE, bytecode, bytecode_len);
+
+        /* number of consts */
+        ngx_memzero(lf->begin_code.str + POS_BYTECODE + bytecode_len,
+                    sizeof(int));
+        /* number of internal functions */
+        ngx_memcpy(lf->begin_code.str + POS_BYTECODE + bytecode_len
+                   + sizeof(int), &num_of_inter_func, sizeof(int));
+
+        lf->begin_code_len += bytecode_len + sizeof(int) + sizeof(int);
+
+#if defined(DDEBUG) && (DDEBUG)
+        {
+        size_t i = 0;
+        dd("==LUA_BEGIN_CODE: %ld==", lf->begin_code_len);
+        for (i = 0; i < lf->begin_code_len; i++) {
+            dd("%ld: 0x%02X", i, (unsigned) ((u_char) lf->begin_code.str[i]));
+        }
+        dd("==LUA_BEGIN_CODE_END==");
+        }
+#endif
+
+        /* clear the following fields to zero:
+         * - lineinfo vector size
+         * - number of local vars
+         * - number of upvalues
+         */
+        ngx_memzero(lf->end_code.str, sizeof(int) * 3);
+
+        lf->end_code_len = sizeof(int) + sizeof(int) + sizeof(int);
+
+#if defined(DDEBUG) && (DDEBUG)
+        {
+        size_t i = 0;
+        dd("==LUA_END_CODE: %ld==", lf->end_code_len);
+        for (i = 0; i < lf->end_code_len; i++) {
+            dd("%ld: 0x%02X", i, (unsigned) ((u_char) lf->end_code.str[i]));
+        }
+        dd("==LUA_END_CODE_END==");
+        }
+#endif
+
+    }
+
+    return 0;
+
+error:
+
+    if (lf->f != stdin) {
+        fclose(lf->f);  /* close file (even in case of errors) */
+    }
+
+    filename = lua_tostring(L, fname_index) + 1;
+
+    if (serr) {
+        lua_pushfstring(L, "%s in %s: %s", emsg, filename, serr);
+
+    } else {
+        lua_pushfstring(L, "%s in %s", emsg, filename);
+    }
+
+    lua_remove(L, fname_index);
+
+    return LUA_ERRFILE;
+}
+
+
 int
 ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
 {
+    int                         c, status, readstatus;
+    ngx_flag_t                  sharp;
     clfactory_file_ctx_t        lf;
-    int                         status, readstatus;
-    int                         c;
 
     /* index of filename on the stack */
     int                         fname_index;
 
+    sharp = 0;
     fname_index = lua_gettop(L) + 1;
 
     lf.extraline = 0;
+    lf.file_type = NGX_LUA_TEXT_FILE;
+
+    lf.begin_code.ptr = CLFACTORY_BEGIN_CODE;
+    lf.begin_code_len = CLFACTORY_BEGIN_SIZE;
+    lf.end_code.ptr = CLFACTORY_END_CODE;
+    lf.end_code_len = CLFACTORY_END_SIZE;
 
     if (filename == NULL) {
         lua_pushliteral(L, "=stdin");
@@ -49,8 +544,9 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
         lua_pushfstring(L, "@%s", filename);
         lf.f = fopen(filename, "r");
 
-        if (lf.f == NULL)
+        if (lf.f == NULL) {
             return clfactory_errfile(L, "open", fname_index);
+        }
     }
 
     c = getc(lf.f);
@@ -65,23 +561,74 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
         if (c == '\n') {
             c = getc(lf.f);
         }
+
+        sharp = 1;
     }
 
     if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
-        /* no binary file supported as closure factory code needs to be */
-        /* compiled to bytecode along with user code */
-        return clfactory_errfile(L, "load binary file", fname_index);
+        lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
+
+        if (lf.f == NULL) {
+            return clfactory_errfile(L, "reopen", fname_index);
+        }
+
+        /* check whether lib jit exists */
+        luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1);
+        lua_getfield(L, -1, "jit");  /* get _LOADED["jit"] */
+
+        if (lua_istable(L, -1)) {
+            lf.file_type = NGX_LUA_BT_LJ;
+
+        } else {
+            lf.file_type = NGX_LUA_BT_LUA;
+        }
+
+        lua_pop(L, 2);
+
+        /*
+         * Loading bytecode with an extra header is disabled for security
+         * reasons. This may circumvent the usual check for bytecode vs.
+         * Lua code by looking at the first char. Since this is a potential
+         * security violation no attempt is made to echo the chunkname either.
+         */
+        if (lf.file_type == NGX_LUA_BT_LJ && sharp) {
+
+            if (filename) {
+                fclose(lf.f);  /* close file (even in case of errors) */
+            }
+
+            filename = lua_tostring(L, fname_index) + 1;
+            lua_pushfstring(L, "bad byte-code header in %s", filename);
+            lua_remove(L, fname_index);
+
+            return LUA_ERRFILE;
+        }
+
+        while ((c = getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) {
+            /* skip eventual `#!...' */
+        }
+
+        status = ngx_http_lua_clfactory_bytecode_prepare(L, &lf, fname_index);
+
+        if (status != 0) {
+            return status;
+        }
+
+        lf.extraline = 0;
     }
 
-    ungetc(c, lf.f);
+    if (lf.file_type == NGX_LUA_TEXT_FILE) {
+        ungetc(c, lf.f);
+    }
 
     lf.sent_begin = lf.sent_end = 0;
     status = lua_load(L, clfactory_getF, &lf, lua_tostring(L, -1));
 
     readstatus = ferror(lf.f);
 
-    if (filename)
+    if (filename) {
         fclose(lf.f);  /* close file (even in case of errors) */
+    }
 
     if (readstatus) {
         lua_settop(L, fname_index);  /* ignore results from `lua_load' */
@@ -109,7 +656,8 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 
     ls.s = buff;
     ls.size = size;
-    ls.sent_begin = ls.sent_end = 0;
+    ls.sent_begin = 0;
+    ls.sent_end = 0;
 
     return lua_load(L, clfactory_getS, &ls, name);
 }
@@ -118,33 +666,69 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 static const char *
 clfactory_getF(lua_State *L, void *ud, size_t *size)
 {
+    char                        *buf;
+    size_t                       num;
     clfactory_file_ctx_t        *lf;
 
     lf = (clfactory_file_ctx_t *) ud;
 
-    if (lf->sent_begin == 0) {
-        lf->sent_begin = 1;
-        *size = CLFACTORY_BEGIN_SIZE;
-        return CLFACTORY_BEGIN_CODE;
-    }
-
     if (lf->extraline) {
         lf->extraline = 0;
         *size = 1;
         return "\n";
     }
 
+    if (lf->sent_begin == 0) {
+        lf->sent_begin = 1;
+        *size = lf->begin_code_len;
+
+        if (lf->file_type == NGX_LUA_TEXT_FILE) {
+            buf = lf->begin_code.ptr;
+
+        } else {
+            buf = lf->begin_code.str;
+        }
+
+        return buf;
+    }
+
     if (feof(lf->f)) {
+
         if (lf->sent_end == 0) {
             lf->sent_end = 1;
-            *size = CLFACTORY_END_SIZE;
-            return CLFACTORY_END_CODE;
+            *size = lf->end_code_len;
+
+            if (lf->file_type == NGX_LUA_BT_LUA) {
+                buf = lf->end_code.str;
+
+            } else {
+                buf = lf->end_code.ptr;
+            }
+
+            return buf;
         }
 
         return NULL;
     }
 
-    *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
+    num = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
+
+    /* skip the footer(\x00) in luajit */
+    if (num > 0 && lf->file_type == NGX_LUA_BT_LJ) {
+        lf->rest_len -= num;
+
+        if (lf->rest_len == 0) {
+            if (--num == 0 && lf->sent_end == 0) {
+                lf->sent_end = 1;
+                buf = lf->end_code.ptr;
+                *size = lf->end_code_len;
+
+                return buf;
+            }
+        }
+    }
+
+    *size = num;
 
     return (*size > 0) ? lf->buff : NULL;
 }
@@ -156,10 +740,16 @@ clfactory_errfile(lua_State *L, const char *what, int fname_index)
     const char      *serr;
     const char      *filename;
 
-    serr = strerror(errno);
     filename = lua_tostring(L, fname_index) + 1;
 
-    lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+    if (errno) {
+        serr = strerror(errno);
+        lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+
+    } else {
+        lua_pushfstring(L, "cannot %s %s", what, filename);
+    }
+
     lua_remove(L, fname_index);
 
     return LUA_ERRFILE;
@@ -169,9 +759,7 @@ clfactory_errfile(lua_State *L, const char *what, int fname_index)
 static const char *
 clfactory_getS(lua_State *L, void *ud, size_t *size)
 {
-    clfactory_buffer_ctx_t      *ls;
-
-    ls = (clfactory_buffer_ctx_t *) ud;
+    clfactory_buffer_ctx_t      *ls = ud;
 
     if (ls->sent_begin == 0) {
         ls->sent_begin = 1;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_common.h b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
index 2e03c7e..2dde936 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
@@ -24,11 +24,6 @@
 #define MD5_DIGEST_LENGTH 16
 #endif
 
-#define NGX_HTTP_LUA_CHECK_ABORTED(L, ctx) \
-        if (ctx && ctx->aborted) { \
-            return luaL_error(L, "coroutine aborted"); \
-        }
-
 /* Nginx HTTP Lua Inline tag prefix */
 
 #define NGX_HTTP_LUA_INLINE_TAG "nhli_"
@@ -69,7 +64,29 @@ typedef struct {
 #endif
 
 
+#define NGX_HTTP_LUA_CONTEXT_SET            0x01
+#define NGX_HTTP_LUA_CONTEXT_REWRITE        0x02
+#define NGX_HTTP_LUA_CONTEXT_ACCESS         0x04
+#define NGX_HTTP_LUA_CONTEXT_CONTENT        0x08
+#define NGX_HTTP_LUA_CONTEXT_LOG            0x10
+#define NGX_HTTP_LUA_CONTEXT_HEADER_FILTER  0x20
+#define NGX_HTTP_LUA_CONTEXT_BODY_FILTER    0x40
+
+
+typedef struct ngx_http_lua_main_conf_s ngx_http_lua_main_conf_t;
+
+
+typedef ngx_int_t (*ngx_http_lua_conf_handler_pt)(ngx_log_t *log,
+        ngx_http_lua_main_conf_t *lmcf, lua_State *L);
+
+
 typedef struct {
+    u_char              *package;
+    lua_CFunction        loader;
+} ngx_http_lua_preload_hook_t;
+
+
+struct ngx_http_lua_main_conf_s {
     lua_State       *lua;
 
     ngx_str_t        lua_path;
@@ -84,10 +101,23 @@ typedef struct {
 
     ngx_array_t     *shm_zones;  /* of ngx_shm_zone_t* */
 
+    ngx_array_t     *preload_hooks; /* of ngx_http_lua_preload_hook_t */
+
     ngx_flag_t       postponed_to_rewrite_phase_end;
     ngx_flag_t       postponed_to_access_phase_end;
 
-} ngx_http_lua_main_conf_t;
+    ngx_http_lua_conf_handler_pt    init_handler;
+    ngx_str_t                       init_src;
+    ngx_uint_t                      shm_zones_inited;
+
+    unsigned         requires_header_filter:1;
+    unsigned         requires_body_filter:1;
+    unsigned         requires_capture_filter:1;
+    unsigned         requires_rewrite:1;
+    unsigned         requires_access:1;
+    unsigned         requires_log:1;
+    unsigned         requires_shm:1;
+};
 
 
 typedef struct {
@@ -102,8 +132,11 @@ typedef struct {
     ngx_http_handler_pt     rewrite_handler;
     ngx_http_handler_pt     access_handler;
     ngx_http_handler_pt     content_handler;
+    ngx_http_handler_pt     log_handler;
     ngx_http_handler_pt     header_filter_handler;
 
+    ngx_http_output_body_filter_pt         body_filter_handler;
+
     ngx_http_complex_value_t rewrite_src;    /*  rewrite_by_lua
                                                 inline script/script
                                                 file path */
@@ -122,13 +155,23 @@ typedef struct {
 
     u_char                 *content_src_key; /* cached key for content_src */
 
-    ngx_http_complex_value_t header_filter_src;    /*  header_filter_by_lua
-                                                inline script/script
-                                                file path */
+
+    ngx_http_complex_value_t     log_src;     /* log_by_lua inline script/script
+                                                 file path */
+
+    u_char                      *log_src_key; /* cached key for log_src */
+
+    ngx_http_complex_value_t header_filter_src;  /*  header_filter_by_lua
+                                                     inline script/script
+                                                     file path */
 
     u_char                 *header_filter_src_key;
                                     /* cached key for header_filter_src */
 
+
+    ngx_http_complex_value_t         body_filter_src;
+    u_char                          *body_filter_src_key;
+
     ngx_msec_t                       keepalive_timeout;
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       send_timeout;
@@ -139,19 +182,115 @@ typedef struct {
 
     ngx_uint_t                       pool_size;
 
+    ngx_flag_t                       transform_underscores_in_resp_headers;
+    ngx_flag_t                       log_socket_errors;
+    ngx_flag_t                       check_client_abort;
 } ngx_http_lua_loc_conf_t;
 
 
-typedef struct {
-    void            *data;
+typedef enum {
+    NGX_HTTP_LUA_USER_CORO_NOP      = 0,
+    NGX_HTTP_LUA_USER_CORO_RESUME   = 1,
+    NGX_HTTP_LUA_USER_CORO_YIELD    = 2,
+    NGX_HTTP_LUA_USER_THREAD_RESUME = 3
+} ngx_http_lua_user_coro_op_t;
 
-    lua_State       *cc;                /*  coroutine to handle request */
 
-    int              cc_ref;            /*  reference to anchor coroutine in
-                                            the lua registry */
+typedef enum {
+    NGX_HTTP_LUA_CO_RUNNING   = 0, /* coroutine running */
+    NGX_HTTP_LUA_CO_SUSPENDED = 1, /* coroutine suspended */
+    NGX_HTTP_LUA_CO_NORMAL    = 2, /* coroutine normal */
+    NGX_HTTP_LUA_CO_DEAD      = 3, /* coroutine dead */
+    NGX_HTTP_LUA_CO_ZOMBIE    = 4, /* coroutine zombie */
+} ngx_http_lua_co_status_t;
 
-    int              ctx_ref;           /*  reference to anchor request ctx
-                                            data in lua registry */
+
+typedef struct ngx_http_lua_co_ctx_s  ngx_http_lua_co_ctx_t;
+
+typedef struct ngx_http_lua_posted_thread_s  ngx_http_lua_posted_thread_t;
+
+struct ngx_http_lua_posted_thread_s {
+    ngx_http_lua_co_ctx_t               *co_ctx;
+    ngx_http_lua_posted_thread_t        *next;
+};
+
+
+struct ngx_http_lua_co_ctx_s {
+    void                    *data;      /* user state for cosockets */
+
+    lua_State               *co;
+    ngx_http_lua_co_ctx_t   *parent_co_ctx;
+
+    ngx_http_lua_posted_thread_t    *zombie_child_threads;
+
+    ngx_http_cleanup_pt      cleanup;
+
+    unsigned                 nsubreqs;  /* number of subrequests of the
+                                         * current request */
+
+    ngx_int_t               *sr_statuses; /* all capture subrequest statuses */
+
+    ngx_http_headers_out_t **sr_headers;
+
+    ngx_str_t               *sr_bodies;   /* all captured subrequest bodies */
+
+    unsigned                 pending_subreqs; /* number of subrequests being
+                                                 waited */
+
+    ngx_event_t              sleep;  /* used for ngx.sleep */
+
+    int                      co_ref; /*  reference to anchor the thread
+                                         coroutines (entry coroutine and user
+                                         threads) in the Lua registry,
+                                         preventing the thread coroutine
+                                         from beging collected by the
+                                         Lua GC */
+
+    unsigned                 waited_by_parent:1;  /* whether being waited by
+                                                     a parent coroutine */
+
+    ngx_http_lua_co_status_t co_status:3;  /* the current coroutine's status */
+
+    unsigned                 flushing:1; /* indicates whether the current
+                                            coroutine is waiting for
+                                            ngx.flush(true) */
+
+    unsigned                 is_uthread:1; /* whether the current coroutine is
+                                              a user thread */
+
+    unsigned                 thread_spawn_yielded:1; /* yielded from
+                                                        the ngx.thread.spawn()
+                                                        call */
+};
+
+
+typedef struct ngx_http_lua_ctx_s {
+    uint8_t                  context;   /* the current running directive context
+                                           (or running phase) for the current
+                                           Lua chunk */
+
+    ngx_http_handler_pt      resume_handler;
+
+    ngx_http_lua_co_ctx_t   *cur_co_ctx; /* co ctx for the current coroutine */
+
+    /* FIXME: we should use rbtree here to prevent O(n) lookup overhead */
+    ngx_list_t              *user_co_ctx; /* coroutine contexts for user
+                                             coroutines */
+
+    ngx_http_lua_co_ctx_t    entry_co_ctx; /* coroutine context for the
+                                              entry coroutine */
+
+    ngx_http_lua_co_ctx_t   *on_abort_co_ctx; /* coroutine context for the
+                                                 on_abort thread */
+
+    int                      ctx_ref;  /*  reference to anchor
+                                           request ctx data in lua
+                                           registry */
+
+    unsigned                 flushing_coros; /* number of coroutines waiting on
+                                                ngx.flush(true) */
+
+    unsigned                 uthreads; /* number of active user threads */
 
     ngx_chain_t             *out;  /* buffered output chain for HTTP 1.0 */
     ngx_chain_t             *free_bufs;
@@ -161,26 +300,34 @@ typedef struct {
 
     ngx_http_cleanup_pt     *cleanup;
 
-    ngx_chain_t             *body; /* buffered response body chains */
+    ngx_chain_t             *body; /* buffered subrequest response body
+                                      chains */
 
-    unsigned                 nsubreqs;  /* number of subrequests of the
-                                         * current request */
+    ngx_str_t                exec_uri;
+    ngx_str_t                exec_args;
 
-    ngx_int_t       *sr_statuses; /* all capture subrequest statuses */
+    ngx_int_t                exit_code;
 
-    ngx_http_headers_out_t  **sr_headers;
+    ngx_http_lua_co_ctx_t   *req_body_reader_co_ctx; /* co ctx for the coroutine
+                                                        reading the request
+                                                        body */
 
-    ngx_str_t       *sr_bodies;   /* all captured subrequest bodies */
+    ngx_uint_t               index;              /* index of the current
+                                                    subrequest in its parent
+                                                    request */
 
-    ngx_uint_t       index;              /* index of the current subrequest
-                                            in its parent request */
+    ngx_http_lua_posted_thread_t   *posted_threads;
 
-    unsigned         waiting;     /* number of subrequests being waited */
+    unsigned                 run_post_subrequest:1; /* whether it has run
+                                                       post_subrequest
+                                                       (for subrequests only) */
 
-    ngx_str_t        exec_uri;
-    ngx_str_t        exec_args;
+    unsigned                 waiting_more_body:1;   /* 1: waiting for more
+                                                       request body data;
+                                                       0: no need to wait */
+
+    ngx_http_lua_user_coro_op_t   co_op:2; /*  coroutine API operation */
 
-    ngx_int_t        exit_code;
     unsigned         exited:1;
 
     unsigned         headers_sent:1;    /*  1: response header has been sent;
@@ -189,47 +336,37 @@ typedef struct {
     unsigned         eof:1;             /*  1: last_buf has been sent;
                                             0: last_buf not sent yet */
 
-    unsigned         done:1;            /*  1: subrequest is just done;
-                                            0: subrequest is not done
-                                            yet or has already done */
+    unsigned         capture:1;  /*  1: response body of current request
+                                        is to be captured by the lua
+                                        capture filter,
+                                     0: not to be captured */
 
-    unsigned         capture:1;         /*  1: body of current request is
-                                            to be captured;
-                                            0: not captured */
 
     unsigned         read_body_done:1;      /* 1: request body has been all
                                                read; 0: body has not been
                                                all read */
 
-    unsigned         waiting_more_body:1;   /* 1: waiting for more data;
-                                               0: no need to wait */
-    unsigned         req_read_body_done:1;  /* used by ngx.req.read_body */
+    unsigned         headers_set:1; /* whether the user has set custom
+                                       response headers */
 
-    unsigned         headers_set:1;
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;
     unsigned         entered_content_phase:1;
 
-    /* whether it has run post_subrequest */
-    unsigned         run_post_subrequest:1;
-    unsigned         req_header_cached:1;
-
-    unsigned         waiting_flush:1;
-
-    unsigned         socket_busy:1;
-    unsigned         socket_ready:1;
-
-    unsigned         aborted:1;
-    unsigned         buffering:1;
+    unsigned         buffering:1; /* HTTP 1.0 response body buffering flag */
 
+    unsigned         no_abort:1; /* prohibit "world abortion" via ngx.exit()
+                                    and etc */
 } ngx_http_lua_ctx_t;
 
 
 typedef struct ngx_http_lua_header_val_s ngx_http_lua_header_val_t;
 
+
 typedef ngx_int_t (*ngx_http_lua_set_header_pt)(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value);
 
+
 struct ngx_http_lua_header_val_s {
     ngx_http_complex_value_t                value;
     ngx_uint_t                              hash;
@@ -239,10 +376,11 @@ struct ngx_http_lua_header_val_s {
     unsigned                                no_override;
 };
 
+
 typedef struct {
     ngx_str_t                               name;
     ngx_uint_t                              offset;
-    ngx_http_lua_set_header_pt     handler;
+    ngx_http_lua_set_header_pt              handler;
 
 } ngx_http_lua_set_header_t;
 
@@ -252,27 +390,5 @@ extern ngx_http_output_header_filter_pt ngx_http_lua_next_header_filter;
 extern ngx_http_output_body_filter_pt ngx_http_lua_next_body_filter;
 
 
-/*  user code cache table key in Lua vm registry */
-#define LUA_CODE_CACHE_KEY "ngx_http_lua_code_cache"
-
-/*  coroutine anchoring table key in Lua vm registry */
-#define NGX_LUA_CORT_REF "ngx_lua_cort_ref"
-
-/*  request ctx data anchoring table key in Lua vm registry */
-#define NGX_LUA_REQ_CTX_REF "ngx_lua_req_ctx_ref"
-
-/*  regex cache table key in Lua vm registry */
-#define NGX_LUA_REGEX_CACHE "ngx_lua_regex_cache"
-
-/*  socket connection pool table key in Lua vm registry */
-#define NGX_LUA_SOCKET_POOL "ngx_lua_socket_pool"
-
-/*  globals symbol to hold nginx request pointer */
-#define GLOBALS_SYMBOL_REQUEST    "ngx._r"
-
-/*  globals symbol to hold code chunk handling nginx request */
-#define GLOBALS_SYMBOL_RUNCODE    "ngx._code"
-
-
 #endif /* NGX_HTTP_LUA_COMMON_H */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_conf.c b/debian/modules/nginx-lua/src/ngx_http_lua_conf.c
deleted file mode 100644
index c0723db..0000000
--- a/debian/modules/nginx-lua/src/ngx_http_lua_conf.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include <nginx.h>
-#include "ngx_http_lua_conf.h"
-#include "ngx_http_lua_util.h"
-
-
-static void ngx_http_lua_cleanup_vm(void *data);
-static char * ngx_http_lua_init_vm(ngx_conf_t *cf,
-        ngx_http_lua_main_conf_t *lmcf);
-
-
-void *
-ngx_http_lua_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_main_conf_t));
-    if (lmcf == NULL) {
-        return NULL;
-    }
-
-    /* set by ngx_pcalloc:
-     *      lmcf->lua = NULL;
-     *      lmcf->lua_path = { 0, NULL };
-     *      lmcf->lua_cpath = { 0, NULL };
-     *      lmcf->regex_cache_entries = 0;
-     *      lmcf->shm_zones = NULL;
-     */
-
-    lmcf->pool = cf->pool;
-#if (NGX_PCRE)
-    lmcf->regex_cache_max_entries = NGX_CONF_UNSET;
-#endif
-    lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
-
-    dd("nginx Lua module main config structure initialized!");
-
-    return lmcf;
-}
-
-
-char *
-ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
-{
-    ngx_http_lua_main_conf_t *lmcf = conf;
-
-#if (NGX_PCRE)
-    if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
-        lmcf->regex_cache_max_entries = 1024;
-    }
-#endif
-
-    if (lmcf->lua == NULL) {
-        if (ngx_http_lua_init_vm(cf, lmcf) != NGX_CONF_OK) {
-            ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
-                               "Failed to initialize Lua VM");
-            return NGX_CONF_ERROR;
-        }
-
-        dd("Lua VM initialized!");
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-void *
-ngx_http_lua_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_lua_loc_conf_t *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_loc_conf_t));
-    if (conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* set by ngx_pcalloc:
-     *      conf->access_src  = {{ 0, NULL }, NULL, NULL, NULL};
-     *      conf->access_src_key = NULL
-     *      conf->rewrite_src = {{ 0, NULL }, NULL, NULL, NULL};
-     *      conf->rewrite_src_key = NULL
-     *      conf->rewrite_handler = NULL;
-     *
-     *      conf->content_src = {{ 0, NULL }, NULL, NULL, NULL};
-     *      conf->content_src_key = NULL
-     *      conf->content_handler = NULL;
-     *
-     *      conf->header_filter_src = {{ 0, NULL }, NULL, NULL, NULL};
-     *      conf->header_filter_src_key = NULL
-     *      conf->header_filter_handler = NULL;
-     */
-
-    conf->force_read_body   = NGX_CONF_UNSET;
-    conf->enable_code_cache = NGX_CONF_UNSET;
-    conf->http10_buffering  = NGX_CONF_UNSET;
-
-    conf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
-    conf->connect_timeout = NGX_CONF_UNSET_MSEC;
-    conf->send_timeout = NGX_CONF_UNSET_MSEC;
-    conf->read_timeout = NGX_CONF_UNSET_MSEC;
-    conf->send_lowat = NGX_CONF_UNSET_SIZE;
-    conf->buffer_size = NGX_CONF_UNSET_SIZE;
-    conf->pool_size = NGX_CONF_UNSET_UINT;
-
-    return conf;
-}
-
-
-char *
-ngx_http_lua_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_lua_loc_conf_t *prev = parent;
-    ngx_http_lua_loc_conf_t *conf = child;
-
-    if (conf->rewrite_src.value.len == 0) {
-        conf->rewrite_src = prev->rewrite_src;
-        conf->rewrite_handler = prev->rewrite_handler;
-        conf->rewrite_src_key = prev->rewrite_src_key;
-    }
-
-    if (conf->access_src.value.len == 0) {
-        conf->access_src = prev->access_src;
-        conf->access_handler = prev->access_handler;
-        conf->access_src_key = prev->access_src_key;
-    }
-
-    if (conf->content_src.value.len == 0) {
-        conf->content_src = prev->content_src;
-        conf->content_handler = prev->content_handler;
-        conf->content_src_key = prev->content_src_key;
-    }
-
-    if (conf->header_filter_src.value.len == 0) {
-        conf->header_filter_src = prev->header_filter_src;
-        conf->header_filter_handler = prev->header_filter_handler;
-        conf->header_filter_src_key = prev->header_filter_src_key;
-    }
-
-    ngx_conf_merge_value(conf->force_read_body, prev->force_read_body, 0);
-    ngx_conf_merge_value(conf->enable_code_cache, prev->enable_code_cache, 1);
-    ngx_conf_merge_value(conf->http10_buffering, prev->http10_buffering, 1);
-
-    ngx_conf_merge_msec_value(conf->keepalive_timeout,
-                              prev->keepalive_timeout, 60000);
-
-    ngx_conf_merge_msec_value(conf->connect_timeout,
-                              prev->connect_timeout, 60000);
-
-    ngx_conf_merge_msec_value(conf->send_timeout,
-                              prev->send_timeout, 60000);
-
-    ngx_conf_merge_msec_value(conf->read_timeout,
-                              prev->read_timeout, 60000);
-
-    ngx_conf_merge_size_value(conf->send_lowat,
-                              prev->send_lowat, 0);
-
-    ngx_conf_merge_size_value(conf->buffer_size,
-                              prev->buffer_size,
-                              (size_t) ngx_pagesize);
-
-    ngx_conf_merge_uint_value(conf->pool_size, prev->pool_size, 30);
-
-    return NGX_CONF_OK;
-}
-
-
-static void
-ngx_http_lua_cleanup_vm(void *data)
-{
-    lua_State *L = data;
-
-    if (L != NULL) {
-        lua_close(L);
-
-        dd("Lua VM closed!");
-    }
-}
-
-
-static char *
-ngx_http_lua_init_vm(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
-{
-    ngx_pool_cleanup_t *cln;
-
-    /* add new cleanup handler to config mem pool */
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* create new Lua VM instance */
-    lmcf->lua = ngx_http_lua_new_state(cf, lmcf);
-    if (lmcf->lua == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* register cleanup handler for Lua VM */
-    cln->handler = ngx_http_lua_cleanup_vm;
-    cln->data = lmcf->lua;
-
-    return NGX_CONF_OK;
-}
-
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_conf.h b/debian/modules/nginx-lua/src/ngx_http_lua_conf.h
deleted file mode 100644
index deaf1be..0000000
--- a/debian/modules/nginx-lua/src/ngx_http_lua_conf.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
-
-#ifndef NGX_HTTP_LUA_CONF_H
-#define NGX_HTTP_LUA_CONF_H
-
-#include "ngx_http_lua_common.h"
-
-void * ngx_http_lua_create_main_conf(ngx_conf_t *cf);
-char * ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf);
-
-void * ngx_http_lua_create_loc_conf(ngx_conf_t *cf);
-char * ngx_http_lua_merge_loc_conf(ngx_conf_t *cf, void *parent,
-        void *child);
-
-#endif /* NGX_HTTP_LUA_CONF_H */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
index d1f9f2d..3239382 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
@@ -5,41 +5,40 @@
 #endif
 #include "ddebug.h"
 
-#include <nginx.h>
+
 #include "ngx_http_lua_contentby.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_exception.h"
 #include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_probe.h"
 
 
 static void ngx_http_lua_content_phase_post_read(ngx_http_request_t *r);
+static ngx_int_t ngx_http_lua_content_run_posted_threads(lua_State *L,
+    ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx, int n);
 
 
 ngx_int_t
 ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
 {
-    int                      cc_ref;
-    lua_State               *cc;
+    int                      co_ref;
+    ngx_int_t                rc;
+    lua_State               *co;
     ngx_http_lua_ctx_t      *ctx;
     ngx_http_cleanup_t      *cln;
 
+    ngx_http_lua_loc_conf_t      *llcf;
+
     dd("content by chunk");
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
     if (ctx == NULL) {
-        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+        ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
-        dd("setting new ctx, ctx = %p", ctx);
-
-        ctx->cc_ref = LUA_NOREF;
-        ctx->ctx_ref = LUA_NOREF;
-
-        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
-
     } else {
         dd("reset ctx");
         ngx_http_lua_reset_ctx(r, L, ctx);
@@ -48,34 +47,31 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     ctx->entered_content_phase = 1;
 
     /*  {{{ new coroutine to handle request */
-    cc = ngx_http_lua_new_thread(r, L, &cc_ref);
+    co = ngx_http_lua_new_thread(r, L, &co_ref);
 
-    if (cc == NULL) {
+    if (co == NULL) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "(lua-content-by-chunk) failed to create new coroutine "
-                "to handle request");
+                     "lua: failed to create new coroutine to handle request");
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
     /*  move code closure to new coroutine */
-    lua_xmove(L, cc, 1);
+    lua_xmove(L, co, 1);
 
     /*  set closure's env table to new coroutine's globals table */
-    lua_pushvalue(cc, LUA_GLOBALSINDEX);
-    lua_setfenv(cc, -2);
-
-    /*  save reference of code to ease forcing stopping */
-    lua_pushvalue(cc, -1);
-    lua_setglobal(cc, GLOBALS_SYMBOL_RUNCODE);
+    lua_pushvalue(co, LUA_GLOBALSINDEX);
+    lua_setfenv(co, -2);
 
     /*  save nginx request in coroutine globals table */
-    lua_pushlightuserdata(cc, r);
-    lua_setglobal(cc, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(co, &ngx_http_lua_request_key);
+    lua_pushlightuserdata(co, r);
+    lua_rawset(co, LUA_GLOBALSINDEX);
     /*  }}} */
 
-    ctx->cc = cc;
-    ctx->cc_ref = cc_ref;
+    ctx->cur_co_ctx = &ctx->entry_co_ctx;
+    ctx->cur_co_ctx->co = co;
+    ctx->cur_co_ctx->co_ref = co_ref;
 
     /*  {{{ register request cleanup hooks */
     if (ctx->cleanup == NULL) {
@@ -90,14 +86,46 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     }
     /*  }}} */
 
-    return ngx_http_lua_run_thread(L, r, ctx, 0);
+    ctx->context = NGX_HTTP_LUA_CONTEXT_CONTENT;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->check_client_abort) {
+        r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
+
+    } else {
+        r->read_event_handler = ngx_http_block_reading;
+    }
+
+    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
+
+    if (rc == NGX_ERROR || rc >= NGX_OK) {
+        return rc;
+    }
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_content_run_posted_threads(L, r, ctx, 0);
+    }
+
+    if (rc == NGX_DONE) {
+        return ngx_http_lua_content_run_posted_threads(L, r, ctx, 1);
+    }
+
+    return NGX_OK;
 }
 
 
 void
 ngx_http_lua_content_wev_handler(ngx_http_request_t *r)
 {
-    (void) ngx_http_lua_wev_handler(r);
+    ngx_http_lua_ctx_t          *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    (void) ctx->resume_handler(r);
 }
 
 
@@ -108,6 +136,9 @@ ngx_http_lua_content_handler(ngx_http_request_t *r)
     ngx_http_lua_ctx_t          *ctx;
     ngx_int_t                    rc;
 
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua content handler, uri \"%V\"", &r->uri);
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (llcf->content_handler == NULL) {
@@ -120,17 +151,10 @@ ngx_http_lua_content_handler(ngx_http_request_t *r)
     dd("ctx = %p", ctx);
 
     if (ctx == NULL) {
-        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+        ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
-
-        dd("setting new ctx: ctx = %p", ctx);
-
-        ctx->cc_ref = LUA_NOREF;
-        ctx->ctx_ref = LUA_NOREF;
-
-        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
     }
 
     dd("entered? %d", (int) ctx->entered_content_phase);
@@ -141,7 +165,7 @@ ngx_http_lua_content_handler(ngx_http_request_t *r)
 
     if (ctx->entered_content_phase) {
         dd("calling wev handler");
-        rc = ngx_http_lua_wev_handler(r);
+        rc = ctx->resume_handler(r);
         dd("wev handler returns %d", (int) rc);
         return rc;
     }
@@ -189,9 +213,7 @@ ngx_http_lua_content_phase_post_read(ngx_http_request_t *r)
         ngx_http_finalize_request(r, ngx_http_lua_content_handler(r));
 
     } else {
-#if defined(nginx_version) && nginx_version >= 8011
         r->main->count--;
-#endif
     }
 }
 
@@ -233,7 +255,7 @@ ngx_http_lua_content_handler_file(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua inlined code: %s", err);
+                      "failed to load Lua inlined code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -241,24 +263,7 @@ ngx_http_lua_content_handler_file(ngx_http_request_t *r)
     /*  make sure we have a valid code chunk */
     assert(lua_isfunction(L, -1));
 
-    rc = ngx_http_lua_content_by_chunk(L, r);
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        return rc;
-    }
-
-    if (rc == NGX_DONE) {
-        return NGX_DONE;
-    }
-
-    if (rc == NGX_AGAIN) {
-#if defined(nginx_version) && nginx_version >= 8011
-        r->main->count++;
-#endif
-        return NGX_DONE;
-    }
-
-    return NGX_OK;
+    return ngx_http_lua_content_by_chunk(L, r);
 }
 
 
@@ -287,28 +292,80 @@ ngx_http_lua_content_handler_inline(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua inlined code: %s", err);
+                      "failed to load Lua inlined code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    rc = ngx_http_lua_content_by_chunk(L, r);
+    return ngx_http_lua_content_by_chunk(L, r);
+}
+
+
+static ngx_int_t
+ngx_http_lua_content_run_posted_threads(lua_State *L, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, int n)
+{
+    ngx_int_t                        rc;
+    ngx_http_lua_posted_thread_t    *pt;
+
+    for ( ;; ) {
+        pt = ctx->posted_threads;
+        if (pt == NULL) {
+            goto done;
+        }
+
+        ctx->posted_threads = pt->next;
+
+        ngx_http_lua_probe_run_posted_thread(r, pt->co_ctx->co,
+                                             (int) pt->co_ctx->co_status);
+
+        if (pt->co_ctx->co_status != NGX_HTTP_LUA_CO_RUNNING) {
+            continue;
+        }
+
+        ctx->cur_co_ctx = pt->co_ctx;
+
+        rc = ngx_http_lua_run_thread(L, r, ctx, 0);
+
+        if (rc == NGX_AGAIN) {
+            continue;
+        }
+
+        if (rc == NGX_DONE) {
+            n++;
+            continue;
+        }
+
+        if (rc == NGX_OK) {
+            while (n > 0) {
+                ngx_http_finalize_request(r, NGX_DONE);
+                n--;
+            }
+
+            return NGX_OK;
+        }
+
+        /* rc == NGX_ERROR || rc > NGX_OK */
 
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
         return rc;
     }
 
-    if (rc == NGX_DONE) {
+done:
+    if (n == 1) {
         return NGX_DONE;
     }
 
-    if (rc == NGX_AGAIN) {
-#if defined(nginx_version) && nginx_version >= 8011
+    if (n == 0) {
         r->main->count++;
-#endif
         return NGX_DONE;
     }
 
-    return NGX_OK;
+    /* n > 1 */
+
+    do {
+        ngx_http_finalize_request(r, NGX_DONE);
+    } while (--n > 1);
+
+    return NGX_DONE;
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_control.c b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
index c7cc8e7..9c25f2b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
@@ -5,61 +5,27 @@
 
 #include "ngx_http_lua_control.h"
 #include "ngx_http_lua_util.h"
+#include "ngx_http_lua_coroutine.h"
 
 
 static int ngx_http_lua_ngx_exec(lua_State *L);
 static int ngx_http_lua_ngx_redirect(lua_State *L);
 static int ngx_http_lua_ngx_exit(lua_State *L);
+static int ngx_http_lua_on_abort(lua_State *L);
 
 
 void
 ngx_http_lua_inject_control_api(ngx_log_t *log, lua_State *L)
 {
-    ngx_int_t         rc;
-
     /* ngx.redirect */
 
     lua_pushcfunction(L, ngx_http_lua_ngx_redirect);
-    lua_setfield(L, -2, "_redirect");
-
-#if 1
-    {
-        const char    buf[] = "ngx._redirect(...) ngx._check_aborted()";
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "ngx.redirect");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx.redirect(): %i",
-                      rc);
-
-    } else {
-        lua_setfield(L, -2, "redirect");
-    }
-#endif
+    lua_setfield(L, -2, "redirect");
 
     /* ngx.exec */
 
     lua_pushcfunction(L, ngx_http_lua_ngx_exec);
-    lua_setfield(L, -2, "_exec");
-
-#if 1
-    {
-        const char    buf[] = "ngx._exec(...) ngx._check_aborted()";
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "ngx.exec");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx.exec(): %i",
-                      rc);
-
-    } else {
-        lua_setfield(L, -2, "exec");
-    }
-#endif
+    lua_setfield(L, -2, "exec");
 
     lua_pushcfunction(L, ngx_http_lua_ngx_exit);
     lua_setfield(L, -2, "throw_error"); /* deprecated */
@@ -67,24 +33,12 @@ ngx_http_lua_inject_control_api(ngx_log_t *log, lua_State *L)
     /* ngx.exit */
 
     lua_pushcfunction(L, ngx_http_lua_ngx_exit);
-    lua_setfield(L, -2, "_exit");
+    lua_setfield(L, -2, "exit");
 
-#if 1
-    {
-        const char    buf[] = "ngx._exit(...) ngx._check_aborted()";
+    /* ngx.on_abort */
 
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "ngx.exit");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx.exit(): %i",
-                      rc);
-
-    } else {
-        lua_setfield(L, -2, "exit");
-    }
-#endif
+    lua_pushcfunction(L, ngx_http_lua_on_abort);
+    lua_setfield(L, -2, "on_abort");
 }
 
 
@@ -108,7 +62,8 @@ ngx_http_lua_ngx_exec(lua_State *L)
                 n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -137,6 +92,15 @@ ngx_http_lua_ngx_exec(lua_State *L)
     uri.len = len;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    ngx_http_lua_check_if_abortable(L, ctx);
 
     if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags)
         != NGX_OK)
@@ -171,6 +135,11 @@ ngx_http_lua_ngx_exec(lua_State *L)
 
             break;
 
+        case LUA_TNIL:
+            user_args.data = NULL;
+            user_args.len = 0;
+            break;
+
         default:
             msg = lua_pushfstring(L, "string, number, or table expected, "
                     "but got %s", luaL_typename(L, 2));
@@ -248,7 +217,8 @@ ngx_http_lua_ngx_redirect(lua_State *L)
         rc = NGX_HTTP_MOVED_TEMPORARILY;
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -261,6 +231,12 @@ ngx_http_lua_ngx_redirect(lua_State *L)
         return luaL_error(L, "no request ctx found");
     }
 
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    ngx_http_lua_check_if_abortable(L, ctx);
+
     if (ctx->headers_sent) {
         return luaL_error(L, "attempt to call ngx.redirect after sending out "
                 "the headers");
@@ -317,7 +293,8 @@ ngx_http_lua_ngx_exit(lua_State *L)
         return luaL_error(L, "expecting one argument");
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -330,11 +307,34 @@ ngx_http_lua_ngx_exit(lua_State *L)
         return luaL_error(L, "no request ctx found");
     }
 
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
     rc = (ngx_int_t) luaL_checkinteger(L, 1);
 
-    if (rc >= NGX_HTTP_SPECIAL_RESPONSE && ctx->headers_sent) {
-        return luaL_error(L, "attempt to call ngx.exit after sending "
-                "out the headers");
+    if (ctx->no_abort
+        && rc != NGX_ERROR
+        && rc != NGX_HTTP_CLOSE
+        && rc != NGX_HTTP_REQUEST_TIME_OUT
+        && rc != NGX_HTTP_CLIENT_CLOSED_REQUEST)
+    {
+        return luaL_error(L, "attempt to abort with pending subrequests");
+    }
+
+    if (ctx->headers_sent
+        && rc >= NGX_HTTP_SPECIAL_RESPONSE
+        && rc != NGX_HTTP_REQUEST_TIME_OUT
+        && rc != NGX_HTTP_CLIENT_CLOSED_REQUEST
+        && rc != NGX_HTTP_CLOSE)
+    {
+        if (rc != (ngx_int_t) r->headers_out.status) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "attempt to "
+                          "set status %i via ngx.exit after sending out the "
+                          "response status %ui", rc, r->headers_out.status);
+        }
+
+        rc = NGX_HTTP_OK;
     }
 
     ctx->exit_code = rc;
@@ -347,3 +347,62 @@ ngx_http_lua_ngx_exit(lua_State *L)
     return lua_yield(L, 0);
 }
 
+
+static int
+ngx_http_lua_on_abort(lua_State *L)
+{
+    ngx_http_request_t           *r;
+    ngx_http_lua_ctx_t           *ctx;
+    ngx_http_lua_co_ctx_t        *coctx = NULL;
+    ngx_http_lua_loc_conf_t      *llcf;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    if (ctx->on_abort_co_ctx) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "duplicate call");
+        return 2;
+    }
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+    if (!llcf->check_client_abort) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "lua_check_client_abort is off");
+        return 2;
+    }
+
+    ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_pushvalue(L, -2);
+
+    dd("on_wait thread 1: %p", lua_tothread(L, -1));
+
+    coctx->co_ref = luaL_ref(L, -2);
+    lua_pop(L, 1);
+
+    coctx->is_uthread = 1;
+    ctx->on_abort_co_ctx = coctx;
+
+    dd("on_wait thread 2: %p", coctx->co);
+
+    coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
+    coctx->parent_co_ctx = ctx->cur_co_ctx;
+
+    lua_pushinteger(L, 1);
+    return 1;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
new file mode 100644
index 0000000..21eeb76
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
@@ -0,0 +1,331 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_coroutine.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_probe.h"
+
+
+/*
+ * Design:
+ *
+ * In order to support using ngx.* API in Lua coroutines, we have to create
+ * new coroutine in the main coroutine instead of the calling coroutine
+ */
+
+
+static int ngx_http_lua_coroutine_create(lua_State *L);
+static int ngx_http_lua_coroutine_resume(lua_State *L);
+static int ngx_http_lua_coroutine_yield(lua_State *L);
+static int ngx_http_lua_coroutine_status(lua_State *L);
+
+
+static const char *
+    ngx_http_lua_co_status_names[] =
+        {"running", "suspended", "normal", "dead", "zombie"};
+
+
+
+static int
+ngx_http_lua_coroutine_create(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    return ngx_http_lua_coroutine_create_helper(L, r, ctx, NULL);
+}
+
+
+int
+ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t **pcoctx)
+{
+    lua_State                     *mt;  /* the main thread */
+    lua_State                     *co;  /* new coroutine to be created */
+    ngx_http_lua_main_conf_t      *lmcf;
+    ngx_http_lua_co_ctx_t         *coctx; /* co ctx for the new coroutine */
+
+    luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1), 1,
+                 "Lua function expected");
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    mt = lmcf->lua;
+
+    /* create new coroutine on root Lua state, so it always yields
+     * to main Lua thread
+     */
+    co = lua_newthread(mt);
+
+    ngx_http_lua_probe_user_coroutine_create(r, L, co);
+
+    coctx = ngx_http_lua_create_co_ctx(r, ctx);
+    if (coctx == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    coctx->co = co;
+    coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
+
+    /* make new coroutine share globals of the parent coroutine.
+     * NOTE: globals don't have to be separated! */
+    lua_pushvalue(L, LUA_GLOBALSINDEX);
+    lua_xmove(L, co, 1);
+    lua_replace(co, LUA_GLOBALSINDEX);
+
+    lua_xmove(mt, L, 1);    /* move coroutine from main thread to L */
+
+    lua_pushvalue(L, 1);    /* copy entry function to top of L*/
+    lua_xmove(L, co, 1);    /* move entry function from L to co */
+
+    if (pcoctx) {
+        *pcoctx = coctx;
+    }
+
+    return 1;    /* return new coroutine to Lua */
+}
+
+
+static int
+ngx_http_lua_coroutine_resume(lua_State *L)
+{
+    lua_State                   *co;
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
+    ngx_http_lua_co_ctx_t       *p_coctx; /* parent co ctx */
+
+    co = lua_tothread(L, 1);
+
+    luaL_argcheck(L, co, 1, "coroutine expected");
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    p_coctx = ctx->cur_co_ctx;
+    if (p_coctx == NULL) {
+        return luaL_error(L, "no parent co ctx found");
+    }
+
+    coctx = ngx_http_lua_get_co_ctx(co, ctx);
+    if (coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
+    }
+
+    ngx_http_lua_probe_user_coroutine_resume(r, L, co);
+
+    if (coctx->co_status != NGX_HTTP_LUA_CO_SUSPENDED) {
+        dd("coroutine resume: %d", coctx->co_status);
+
+        lua_pushboolean(L, 0);
+        lua_pushfstring(L, "cannot resume %s coroutine",
+                        ngx_http_lua_co_status_names[coctx->co_status]);
+        return 2;
+    }
+
+    p_coctx->co_status = NGX_HTTP_LUA_CO_NORMAL;
+
+    coctx->parent_co_ctx = p_coctx;
+
+    dd("set coroutine to running");
+    coctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+
+    ctx->co_op = NGX_HTTP_LUA_USER_CORO_RESUME;
+    ctx->cur_co_ctx = coctx;
+
+    /* yield and pass args to main thread, and resume target coroutine from
+     * there */
+    return lua_yield(L, lua_gettop(L) - 1);
+}
+
+
+static int
+ngx_http_lua_coroutine_yield(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    coctx = ctx->cur_co_ctx;
+
+    coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
+
+    ctx->co_op = NGX_HTTP_LUA_USER_CORO_YIELD;
+
+    if (!coctx->is_uthread && coctx->parent_co_ctx) {
+        dd("set coroutine to running");
+        coctx->parent_co_ctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+
+        ngx_http_lua_probe_user_coroutine_yield(r, coctx->parent_co_ctx->co, L);
+
+    } else {
+        ngx_http_lua_probe_user_coroutine_yield(r, NULL, L);
+    }
+
+    /* yield and pass retvals to main thread,
+     * and resume parent coroutine there */
+    return lua_yield(L, lua_gettop(L));
+}
+
+
+void
+ngx_http_lua_inject_coroutine_api(ngx_log_t *log, lua_State *L)
+{
+    int         rc;
+
+    /* new coroutine table */
+    lua_newtable(L);
+
+    /* get old coroutine table */
+    lua_getglobal(L, "coroutine");
+
+    /* set running to the old one */
+    lua_getfield(L, -1, "running");
+    lua_setfield(L, -3, "running");
+
+    /* pop the old coroutine */
+    lua_pop(L, 1);
+
+    lua_pushcfunction(L, ngx_http_lua_coroutine_create);
+    lua_setfield(L, -2, "create");
+
+    lua_pushcfunction(L, ngx_http_lua_coroutine_resume);
+    lua_setfield(L, -2, "resume");
+
+    lua_pushcfunction(L, ngx_http_lua_coroutine_yield);
+    lua_setfield(L, -2, "yield");
+
+    lua_pushcfunction(L, ngx_http_lua_coroutine_status);
+    lua_setfield(L, -2, "status");
+
+    lua_setglobal(L, "coroutine");
+
+    /* inject wrap */
+    {
+        const char buf[] =
+            "local create, resume = coroutine.create, coroutine.resume\n"
+            "coroutine.wrap = function(f)\n"
+               "local co = create(f)\n"
+               "return function(...) return select(2, resume(co, ...)) end\n"
+            "end\n"
+#if 0
+            "debug.sethook(function () collectgarbage() end, 'rl', 1)"
+#endif
+            ;
+
+        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "coroutine.wrap");
+    }
+
+    if (rc != 0) {
+        ngx_log_error(NGX_LOG_ERR, log, 0,
+                      "failed to load Lua code for coroutine.wrap(): %i: %s",
+                      rc, lua_tostring(L, -1));
+
+        lua_pop(L, 1);
+        return;
+    }
+
+    rc = lua_pcall(L, 0, 0, 0);
+    if (rc != 0) {
+        ngx_log_error(NGX_LOG_ERR, log, 0,
+                      "failed to run the Lua code for coroutine.wrap(): %i: %s",
+                      rc, lua_tostring(L, -1));
+        lua_pop(L, 1);
+    }
+}
+
+
+static int
+ngx_http_lua_coroutine_status(lua_State *L)
+{
+    lua_State                     *co;  /* new coroutine to be created */
+    ngx_http_request_t            *r;
+    ngx_http_lua_ctx_t            *ctx;
+    ngx_http_lua_co_ctx_t         *coctx; /* co ctx for the new coroutine */
+
+    co = lua_tothread(L, 1);
+
+    luaL_argcheck(L, co, 1, "coroutine expected");
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    coctx = ngx_http_lua_get_co_ctx(co, ctx);
+    if (coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
+    }
+
+    dd("co status: %d", coctx->co_status);
+
+    lua_pushstring(L, ngx_http_lua_co_status_names[coctx->co_status]);
+    return 1;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.h b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.h
new file mode 100644
index 0000000..d2be426
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.h
@@ -0,0 +1,17 @@
+/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
+
+#ifndef NGX_HTTP_LUA_COROUTINE_H
+#define NGX_HTTP_LUA_COROUTINE_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_coroutine_api(ngx_log_t *log, lua_State *L);
+
+int ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t **pcoctx);
+
+
+#endif /* NGX_HTTP_LUA_COROUTINE_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ctx.c b/debian/modules/nginx-lua/src/ngx_http_lua_ctx.c
index 5ca8cbb..b03876b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ctx.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ctx.c
@@ -3,6 +3,7 @@
 #endif
 #include "ddebug.h"
 
+#include "ngx_http_lua_util.h"
 #include "ngx_http_lua_ctx.h"
 
 
@@ -12,7 +13,8 @@ ngx_http_lua_ngx_get_ctx(lua_State *L)
     ngx_http_request_t          *r;
     ngx_http_lua_ctx_t          *ctx;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -29,7 +31,8 @@ ngx_http_lua_ngx_get_ctx(lua_State *L)
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                 "lua create ngx.ctx table for the current request");
 
-        lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REQ_CTX_REF);
+        lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
         lua_newtable(L);
         lua_pushvalue(L, -1);
         ctx->ctx_ref = luaL_ref(L, -3);
@@ -39,7 +42,8 @@ ngx_http_lua_ngx_get_ctx(lua_State *L)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
             "lua fetching existing ngx.ctx table for the current request");
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REQ_CTX_REF);
+    lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
     lua_rawgeti(L, -1, ctx->ctx_ref);
 
     return 1;
@@ -52,7 +56,8 @@ ngx_http_lua_ngx_set_ctx(lua_State *L)
     ngx_http_request_t          *r;
     ngx_http_lua_ctx_t          *ctx;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -81,7 +86,8 @@ ngx_http_lua_ngx_set_ctx_helper(lua_State *L, ngx_http_request_t *r,
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                 "lua create ngx.ctx table for the current request");
 
-        lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REQ_CTX_REF);
+        lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
         lua_pushvalue(L, index);
         ctx->ctx_ref = luaL_ref(L, -2);
         lua_pop(L, 1);
@@ -91,7 +97,8 @@ ngx_http_lua_ngx_set_ctx_helper(lua_State *L, ngx_http_request_t *r,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
             "lua fetching existing ngx.ctx table for the current request");
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REQ_CTX_REF);
+    lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, ctx->ctx_ref);
     lua_pushvalue(L, index);
     ctx->ctx_ref = luaL_ref(L, -2);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
index 15205f4..251431c 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -10,11 +10,13 @@
 #include "ngx_http_lua_directive.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_cache.h"
-#include "ngx_http_lua_conf.h"
 #include "ngx_http_lua_contentby.h"
 #include "ngx_http_lua_accessby.h"
 #include "ngx_http_lua_rewriteby.h"
+#include "ngx_http_lua_logby.h"
 #include "ngx_http_lua_headerfilterby.h"
+#include "ngx_http_lua_bodyfilterby.h"
+#include "ngx_http_lua_initby.h"
 #include "ngx_http_lua_shdict.h"
 
 #if defined(NDK) && NDK
@@ -22,16 +24,10 @@
 #endif
 
 
-unsigned  ngx_http_lua_requires_rewrite = 0;
-unsigned  ngx_http_lua_requires_access  = 0;
-unsigned  ngx_http_lua_requires_header_filter = 0;
-unsigned  ngx_http_lua_requires_capture_filter = 0;
-
-
 char *
 ngx_http_lua_shared_dict(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_http_lua_main_conf_t *lmcf = conf;
+    ngx_http_lua_main_conf_t   *lmcf = conf;
 
     ngx_str_t                  *value, name;
     ngx_shm_zone_t             *zone;
@@ -74,6 +70,8 @@ ngx_http_lua_shared_dict(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     ctx->name = name;
+    ctx->main_conf = lmcf;
+    ctx->log = &cf->cycle->new_log;
 
     zone = ngx_shared_memory_add(cf, &name, (size_t) size,
                                      &ngx_http_lua_module);
@@ -94,8 +92,14 @@ ngx_http_lua_shared_dict(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     zone->data = ctx;
 
     zp = ngx_array_push(lmcf->shm_zones);
+    if (zp == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
     *zp = zone;
 
+    lmcf->requires_shm = 1;
+
     return NGX_CONF_OK;
 }
 
@@ -376,9 +380,10 @@ ngx_http_lua_filter_set_by_lua_file(ngx_http_request_t *r, ngx_str_t *val,
 char *
 ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_str_t                   *value;
-    ngx_http_lua_loc_conf_t     *llcf = conf;
     u_char                      *p;
+    ngx_str_t                   *value;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf = conf;
 
     ngx_http_compile_complex_value_t         ccv;
 
@@ -449,10 +454,10 @@ ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     llcf->rewrite_handler = cmd->post;
 
-    if (!ngx_http_lua_requires_rewrite) {
-        ngx_http_lua_requires_rewrite = 1;
-        ngx_http_lua_requires_capture_filter = 1;
-    }
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lmcf->requires_rewrite = 1;
+    lmcf->requires_capture_filter = 1;
 
     return NGX_CONF_OK;
 }
@@ -461,9 +466,10 @@ ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 char *
 ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_str_t                   *value;
-    ngx_http_lua_loc_conf_t     *llcf = conf;
     u_char                      *p;
+    ngx_str_t                   *value;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf = conf;
 
     ngx_http_compile_complex_value_t         ccv;
 
@@ -530,10 +536,10 @@ ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     llcf->access_handler = cmd->post;
 
-    if (!ngx_http_lua_requires_access) {
-        ngx_http_lua_requires_access = 1;
-        ngx_http_lua_requires_capture_filter = 1;
-    }
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lmcf->requires_access = 1;
+    lmcf->requires_capture_filter = 1;
 
     return NGX_CONF_OK;
 }
@@ -542,10 +548,11 @@ ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 char *
 ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    u_char                      *p;
     ngx_str_t                   *value;
     ngx_http_core_loc_conf_t    *clcf;
+    ngx_http_lua_main_conf_t    *lmcf;
     ngx_http_lua_loc_conf_t     *llcf = conf;
-    u_char                      *p;
 
     ngx_http_compile_complex_value_t         ccv;
 
@@ -611,7 +618,9 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     llcf->content_handler = cmd->post;
 
-    ngx_http_lua_requires_capture_filter = 1;
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lmcf->requires_capture_filter = 1;
 
     /*  register location content handler */
     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
@@ -625,13 +634,95 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    u_char                      *p;
+    ngx_str_t                   *value;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf = conf;
+
+    ngx_http_compile_complex_value_t         ccv;
+
+    dd("enter");
+
+    /*  must specifiy a content handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (llcf->log_handler) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (value[1].len == 0) {
+        /*  Oops...Invalid location conf */
+        ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
+                "Invalid location config: no runnable Lua code");
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (cmd->post == ngx_http_lua_log_handler_inline) {
+        /* Don't eval nginx variables for inline lua code */
+        llcf->log_src.value = value[1];
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        llcf->log_src_key = p;
+
+        p = ngx_copy(p, NGX_HTTP_LUA_INLINE_TAG, NGX_HTTP_LUA_INLINE_TAG_LEN);
+        p = ngx_http_lua_digest_hex(p, value[1].data, value[1].len);
+        *p = '\0';
+
+    } else {
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+        ccv.cf = cf;
+        ccv.value = &value[1];
+        ccv.complex_value = &llcf->log_src;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        if (llcf->log_src.lengths == NULL) {
+            /* no variable found */
+            p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+            if (p == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            llcf->log_src_key = p;
+
+            p = ngx_copy(p, NGX_HTTP_LUA_FILE_TAG, NGX_HTTP_LUA_FILE_TAG_LEN);
+            p = ngx_http_lua_digest_hex(p, value[1].data, value[1].len);
+            *p = '\0';
+        }
+    }
+
+    llcf->log_handler = cmd->post;
+
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lmcf->requires_log = 1;
+
+    return NGX_CONF_OK;
+}
+
+
 char *
 ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf)
 {
-    ngx_str_t                   *value;
-    ngx_http_lua_loc_conf_t     *llcf = conf;
     u_char                      *p;
+    ngx_str_t                   *value;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf = conf;
 
     ngx_http_compile_complex_value_t         ccv;
 
@@ -697,8 +788,138 @@ ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     llcf->header_filter_handler = cmd->post;
 
-    if (!ngx_http_lua_requires_header_filter) {
-        ngx_http_lua_requires_header_filter = 1;
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lmcf->requires_header_filter = 1;
+
+    return NGX_CONF_OK;
+}
+
+
+char *
+ngx_http_lua_body_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+        void *conf)
+{
+    u_char                      *p;
+    ngx_str_t                   *value;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf = conf;
+
+    ngx_http_compile_complex_value_t         ccv;
+
+    dd("enter");
+
+    /*  must specifiy a content handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (llcf->body_filter_handler) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (value[1].len == 0) {
+        /*  Oops...Invalid location conf */
+        ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
+                "Invalid location config: no runnable Lua code");
+        return NGX_CONF_ERROR;
+    }
+
+    if (cmd->post == ngx_http_lua_body_filter_inline) {
+        /* Don't eval nginx variables for inline lua code */
+        llcf->body_filter_src.value = value[1];
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        llcf->body_filter_src_key = p;
+
+        p = ngx_copy(p, NGX_HTTP_LUA_INLINE_TAG, NGX_HTTP_LUA_INLINE_TAG_LEN);
+        p = ngx_http_lua_digest_hex(p, value[1].data, value[1].len);
+        *p = '\0';
+
+    } else {
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+        ccv.cf = cf;
+        ccv.value = &value[1];
+        ccv.complex_value = &llcf->body_filter_src;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        if (llcf->body_filter_src.lengths == NULL) {
+            /* no variable found */
+            p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+            if (p == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            llcf->body_filter_src_key = p;
+
+            p = ngx_copy(p, NGX_HTTP_LUA_FILE_TAG, NGX_HTTP_LUA_FILE_TAG_LEN);
+            p = ngx_http_lua_digest_hex(p, value[1].data, value[1].len);
+            *p = '\0';
+        }
+    }
+
+    llcf->body_filter_handler = cmd->post;
+
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lmcf->requires_body_filter = 1;
+    lmcf->requires_header_filter = 1;
+
+    return NGX_CONF_OK;
+}
+
+
+char *
+ngx_http_lua_init_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+        void *conf)
+{
+    u_char                      *name;
+    ngx_str_t                   *value;
+    ngx_http_lua_main_conf_t    *lmcf = conf;
+
+    dd("enter");
+
+    /*  must specifiy a content handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (lmcf->init_handler) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (value[1].len == 0) {
+        /*  Oops...Invalid location conf */
+        ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
+                "Invalid location config: no runnable Lua code");
+        return NGX_CONF_ERROR;
+    }
+
+    lmcf->init_handler = cmd->post;
+
+    if (cmd->post == ngx_http_lua_init_by_file) {
+        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
+                                        value[1].len);
+        if (name == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lmcf->init_src.data = name;
+        lmcf->init_src.len = ngx_strlen(name);
+
+    } else {
+        lmcf->init_src = value[1];
     }
 
     return NGX_CONF_OK;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_directive.h b/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
index 6d79ad9..bd067f8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
@@ -6,35 +6,50 @@
 #include "ngx_http_lua_common.h"
 
 
-extern unsigned  ngx_http_lua_requires_rewrite;
-extern unsigned  ngx_http_lua_requires_access;
-extern unsigned  ngx_http_lua_requires_header_filter;
-extern unsigned  ngx_http_lua_requires_capture_filter;
-
-
 char * ngx_http_lua_shared_dict(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
 char * ngx_http_lua_package_cpath(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
 char * ngx_http_lua_package_path(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
 char * ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
 char * ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
 char * ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
+char * ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+        void *conf);
+
 char * ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
+char * ngx_http_lua_body_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+        void *conf);
+
+char * ngx_http_lua_init_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+        void *conf);
+
 char * ngx_http_lua_code_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 
 #if defined(NDK) && NDK
+
 char * ngx_http_lua_set_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
 char * ngx_http_lua_set_by_lua_file(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
+
 ngx_int_t ngx_http_lua_filter_set_by_lua_inline(ngx_http_request_t *r,
         ngx_str_t *val, ngx_http_variable_value_t *v, void *data);
+
 ngx_int_t ngx_http_lua_filter_set_by_lua_file(ngx_http_request_t *r,
         ngx_str_t *val, ngx_http_variable_value_t *v, void *data);
+
 #endif
 
 char * ngx_http_lua_rewrite_no_postpone(ngx_conf_t *cf, ngx_command_t *cmd,
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_exception.c b/debian/modules/nginx-lua/src/ngx_http_lua_exception.c
index 1685d83..7325ff4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_exception.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_exception.c
@@ -6,6 +6,7 @@
 #include "ddebug.h"
 
 #include "ngx_http_lua_exception.h"
+#include "ngx_http_lua_util.h"
 
 
 /*  longjmp mark for restoring nginx execution after Lua VM crashing */
@@ -14,7 +15,7 @@ jmp_buf ngx_http_lua_exception;
 /**
  * Override default Lua panic handler, output VM crash reason to nginx error
  * log, and restore execution to the nearest jmp-mark.
- * 
+ *
  * @param L Lua state pointer
  * @retval Long jump to the nearest jmp-mark, never returns.
  * @note nginx request pointer should be stored in Lua thread's globals table
@@ -23,25 +24,20 @@ jmp_buf ngx_http_lua_exception;
 int
 ngx_http_lua_atpanic(lua_State *L)
 {
-    u_char                  *s;
-    ngx_http_request_t      *r;
+    u_char                  *s = NULL;
+    size_t                   len;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    /*  log Lua VM crashing reason to error log */
-    if (r && r->connection && r->connection->log) {
-        s = (u_char *) lua_tostring(L, 1);
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "lua atpanic: Lua VM crashed, reason: %s", s);
-
-    } else {
-
-        dd("lua atpanic: can't output Lua VM crashing reason to error log"
-                " due to invalid logging context");
+    if (lua_type(L, -1) == LUA_TSTRING) {
+        s = (u_char *) lua_tolstring(L, -1, &len);
     }
 
+    if (s == NULL) {
+        s = (u_char *) "unknown reason";
+        len = sizeof("unknown reason") - 1;
+    }
+
+    ngx_log_stderr(0, "lua atpanic: Lua VM crashed, reason: %*s", len, s);
+
     /*  restore nginx execution */
     NGX_LUA_EXCEPTION_THROW(1);
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
index c113e9b..683ef01 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
@@ -14,7 +14,6 @@
 #include "ngx_http_lua_regex.h"
 #include "ngx_http_lua_cache.h"
 #include "ngx_http_lua_headers.h"
-#include "ngx_http_lua_ndk.h"
 #include "ngx_http_lua_variable.h"
 #include "ngx_http_lua_string.h"
 #include "ngx_http_lua_misc.h"
@@ -25,6 +24,10 @@
 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
 
 
+/* light user data key for the "ngx" table in the Lua VM regsitry */
+static char ngx_http_lua_headerfilterby_ngx_key;
+
+
 /**
  * Set environment table for the given code closure.
  *
@@ -39,18 +42,17 @@ static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
 static void
 ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
 {
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
     /*  set nginx request pointer to current lua thread's globals table */
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
     lua_pushlightuserdata(L, r);
-    lua_setglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_rawset(L, LUA_GLOBALSINDEX);
 
     /**
      * we want to create empty environment for current script
      *
-     * setmetatable({}, {__index = _G})
+     * newt = {}
+     * newt["_G"] = newt
+     * setmetatable(newt, {__index = _G})
      *
      * if a function or symbol is not defined in our env, __index will lookup
      * in the global env.
@@ -58,32 +60,11 @@ ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
      * all variables created in the script-env will be thrown away at the end
      * of the script run.
      * */
-    lua_newtable(L);    /*  new empty environment aka {} */
-
-#if defined(NDK) && NDK
-    ngx_http_lua_inject_ndk_api(L);
-#endif /* defined(NDK) && NDK */
+    ngx_http_lua_create_new_global_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ initialize ngx.* namespace */
-    lua_createtable(L, 0 /* narr */, 72 /* nrec */);    /*  ngx.* */
-
-    ngx_http_lua_inject_internal_utils(r->connection->log, L);
-
-    ngx_http_lua_inject_http_consts(L);
-    ngx_http_lua_inject_core_consts(L);
-
-    ngx_http_lua_inject_log_api(L);
-    ngx_http_lua_inject_time_api(L);
-    ngx_http_lua_inject_string_api(L);
-#if (NGX_PCRE)
-    ngx_http_lua_inject_regex_api(L);
-#endif
-    ngx_http_lua_inject_req_api_no_io(r->connection->log, L);
-    ngx_http_lua_inject_resp_header_api(L);
-    ngx_http_lua_inject_variable_api(L);
-    ngx_http_lua_inject_shdict_api(lmcf, L);
-    ngx_http_lua_inject_misc_api(L);
-
+    lua_pushlightuserdata(L, &ngx_http_lua_headerfilterby_ngx_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setfield(L, -2, "ngx");
     /*  }}} */
 
@@ -103,13 +84,11 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
 {
     ngx_int_t        rc;
     u_char          *err_msg;
+    size_t           len;
 #if (NGX_PCRE)
     ngx_pool_t      *old_pool;
 #endif
 
-    /*  set Lua VM panic handler */
-    lua_atpanic(L, ngx_http_lua_atpanic);
-
     /*  initialize nginx context in Lua VM, code chunk at stack top    sp = 1 */
     ngx_http_lua_header_filter_by_lua_env(L, r);
 
@@ -118,8 +97,13 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
     old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
 #endif
 
+    lua_pushcfunction(L, ngx_http_lua_traceback);
+    lua_insert(L, 1);  /* put it under chunk and args */
+
     /*  protected call user code */
-    rc = lua_pcall(L, 0, 1, 0);
+    rc = lua_pcall(L, 0, 1, 1);
+
+    lua_remove(L, 1);  /* remove traceback function */
 
 #if (NGX_PCRE)
     /* XXX: work-around to nginx regex subsystem */
@@ -128,15 +112,18 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     if (rc != 0) {
         /*  error occured when running loaded code */
-        err_msg = (u_char *) lua_tostring(L, -1);
+        err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
-        if (err_msg != NULL) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "(lua-error) %s",
-                    err_msg);
-
-            lua_settop(L, 0);    /*  clear remaining elems on stack */
+        if (err_msg == NULL) {
+            err_msg = (u_char *) "unknown reason";
+            len = sizeof("unknown reason") - 1;
         }
 
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "failed to run header_filter_by_lua*: %*s", len, err_msg);
+
+        lua_settop(L, 0); /*  clear remaining elems on stack */
+
         return NGX_ERROR;
     }
 
@@ -156,8 +143,6 @@ ngx_http_lua_header_filter_inline(ngx_http_request_t *r)
     ngx_http_lua_loc_conf_t     *llcf;
     char                        *err;
 
-    dd("HERE");
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
@@ -174,7 +159,7 @@ ngx_http_lua_header_filter_inline(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua inlined code: %s", err);
+                      "failed to load Lua inlined code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -230,7 +215,7 @@ ngx_http_lua_header_filter_file(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua inlined code: %s", err);
+                      "failed to load Lua inlined code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -254,37 +239,53 @@ ngx_http_lua_header_filter(ngx_http_request_t *r)
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_http_lua_ctx_t          *ctx;
     ngx_int_t                    rc;
+    ngx_http_cleanup_t          *cln;
+    uint8_t                      old_context;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua header filter for user lua code, uri \"%V\"", &r->uri);
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
+    if (llcf->body_filter_handler) {
+        r->filter_need_in_memory = 1;
+    }
+
     if (llcf->header_filter_handler == NULL) {
         dd("no header filter handler found");
         return ngx_http_next_header_filter(r);
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua header filter for header_filter_by_lua , uri \"%V\"", &r->uri);
-
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
     dd("ctx = %p", ctx);
 
     if (ctx == NULL) {
-        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+        ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            return NGX_ERROR;
+        }
+    }
+
+    if (ctx->cleanup == NULL) {
+        cln = ngx_http_cleanup_add(r, 0);
+        if (cln == NULL) {
+            return NGX_ERROR;
         }
 
-        dd("setting new ctx: ctx = %p", ctx);
-
-        ctx->cc_ref = LUA_NOREF;
-        ctx->ctx_ref = LUA_NOREF;
-
-        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+        cln->handler = ngx_http_lua_request_cleanup;
+        cln->data = r;
+        ctx->cleanup = &cln->handler;
     }
 
+    old_context = ctx->context;
+    ctx->context = NGX_HTTP_LUA_CONTEXT_HEADER_FILTER;
+
     dd("calling header filter handler");
     rc = llcf->header_filter_handler(r);
+
+    ctx->context = old_context;
+
     if (rc != NGX_OK) {
         dd("calling header filter handler rc %d", (int)rc);
         return NGX_ERROR;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h b/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h
index 236a4a6..083c35e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h
@@ -11,9 +11,12 @@ extern ngx_http_output_header_filter_pt ngx_http_lua_next_filter_header_filter;
 
 
 ngx_int_t ngx_http_lua_header_filter_init(void);
+
 ngx_int_t ngx_http_lua_header_filter_by_chunk(lua_State *L,
         ngx_http_request_t *r);
+
 ngx_int_t ngx_http_lua_header_filter_inline(ngx_http_request_t *r);
+
 ngx_int_t ngx_http_lua_header_filter_file(ngx_http_request_t *r);
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c b/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
index bb6b409..0ea54ed 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
@@ -25,23 +25,30 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L) {
     ngx_uint_t                    i;
     int                           n;
     int                           max;
+    int                           raw = 0;
     int                           count = 0;
 
     n = lua_gettop(L);
 
-    if (n != 0 && n != 1) {
-        return luaL_error(L, "expecting 0 or 1 arguments but seen %d", n);
-    }
+    if (n >= 1) {
+        if (lua_isnil(L, 1)) {
+            max = NGX_HTTP_LUA_MAX_HEADERS;
 
-    if (n == 1) {
-        max = luaL_checkinteger(L, 1);
-        lua_pop(L, 1);
+        } else {
+            max = luaL_checkinteger(L, 1);
+            lua_pop(L, 1);
+        }
+
+        if (n >= 2) {
+            raw = lua_toboolean(L, 2);
+        }
 
     } else {
         max = NGX_HTTP_LUA_MAX_HEADERS;
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -51,11 +58,19 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L) {
 
     lua_createtable(L, 0, 4);
 
+    if (!raw) {
+        lua_pushlightuserdata(L, &ngx_http_lua_req_get_headers_metatable_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+        lua_setmetatable(L, -2);
+    }
+
     part = &r->headers_in.headers.part;
     header = part->elts;
 
     for (i = 0; /* void */; i++) {
 
+        dd("stack top: %d", lua_gettop(L));
+
         if (i >= part->nelts) {
             if (part->next == NULL) {
                 break;
@@ -66,8 +81,15 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L) {
             i = 0;
         }
 
-        lua_pushlstring(L, (char *) header[i].key.data, header[i].key.len);
-            /* stack: table key */
+        if (raw) {
+            lua_pushlstring(L, (char *) header[i].key.data, header[i].key.len);
+
+        } else {
+            lua_pushlstring(L, (char *) header[i].lowcase_key,
+                            header[i].key.len);
+        }
+
+        /* stack: table key */
 
         lua_pushlstring(L, (char *) header[i].value.data,
                 header[i].value.len); /* stack: table key value */
@@ -98,8 +120,10 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     ngx_str_t                    key;
     ngx_uint_t                   i;
     size_t                       len;
+    ngx_http_lua_loc_conf_t     *llcf;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -112,10 +136,14 @@ ngx_http_lua_ngx_header_get(lua_State *L)
 
     dd("key: %.*s, len %d", (int) len, p, (int) len);
 
-    /* replace "_" with "-" */
-    for (i = 0; i < len; i++) {
-        if (p[i] == '_') {
-            p[i] = '-';
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->transform_underscores_in_resp_headers) {
+        /* replace "_" with "-" */
+        for (i = 0; i < len; i++) {
+            if (p[i] == '_') {
+                p[i] = '-';
+            }
         }
     }
 
@@ -146,8 +174,10 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     ngx_http_lua_ctx_t          *ctx;
     ngx_int_t                    rc;
     ngx_uint_t                   n;
+    ngx_http_lua_loc_conf_t     *llcf;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -167,10 +197,14 @@ ngx_http_lua_ngx_header_set(lua_State *L)
 
     dd("key: %.*s, len %d", (int) len, p, (int) len);
 
-    /* replace "_" with "-" */
-    for (i = 0; i < len; i++) {
-        if (p[i] == '_') {
-            p[i] = '-';
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->transform_underscores_in_resp_headers) {
+        /* replace "_" with "-" */
+        for (i = 0; i < len; i++) {
+            if (p[i] == '_') {
+                p[i] = '-';
+            }
         }
     }
 
@@ -224,7 +258,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 rc = ngx_http_lua_set_output_header(r, key, value,
                         i == 1 /* override */);
 
-                if (rc != NGX_OK) {
+                if (rc == NGX_ERROR) {
                     return luaL_error(L,
                             "failed to set header %s (error: %d)",
                             key.data, (int) rc);
@@ -250,7 +284,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
 
     rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
 
-    if (rc != NGX_OK) {
+    if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
                 key.data, (int) rc);
     }
@@ -297,7 +331,8 @@ ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
     ngx_int_t                    rc;
     ngx_uint_t                   n;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -339,7 +374,8 @@ ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
 
         } else {
             for (i = 1; i <= n; i++) {
-                dd("header value table index %d", (int) i);
+                dd("header value table index %d, top: %d", (int) i,
+                   lua_gettop(L));
 
                 lua_rawgeti(L, 2, i);
                 p = (u_char *) luaL_checklstring(L, -1, &len);
@@ -360,7 +396,7 @@ ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
                 rc = ngx_http_lua_set_input_header(r, key, value,
                         i == 1 /* override */);
 
-                if (rc != NGX_OK) {
+                if (rc == NGX_ERROR) {
                     return luaL_error(L,
                             "failed to set header %s (error: %d)",
                             key.data, (int) rc);
@@ -392,7 +428,7 @@ ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
 
     rc = ngx_http_lua_set_input_header(r, key, value, 1 /* override */);
 
-    if (rc != NGX_OK) {
+    if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
                 key.data, (int) rc);
     }
@@ -418,8 +454,10 @@ ngx_http_lua_inject_resp_header_api(lua_State *L)
 
 
 void
-ngx_http_lua_inject_req_header_api(lua_State *L)
+ngx_http_lua_inject_req_header_api(ngx_log_t *log, lua_State *L)
 {
+    int         rc;
+
     lua_pushcfunction(L, ngx_http_lua_ngx_req_header_clear);
     lua_setfield(L, -2, "clear_header");
 
@@ -428,5 +466,31 @@ ngx_http_lua_inject_req_header_api(lua_State *L)
 
     lua_pushcfunction(L, ngx_http_lua_ngx_req_get_headers);
     lua_setfield(L, -2, "get_headers");
+
+    lua_pushlightuserdata(L, &ngx_http_lua_req_get_headers_metatable_key);
+    lua_createtable(L, 0, 1); /* metatable for ngx.req.get_headers(_, true) */
+
+    {
+        const char buf[] =
+            "local tb, key = ...\n"
+            "local new_key = string.gsub(string.lower(key), '_', '-')\n"
+            "if new_key ~= key then return tb[new_key] else return nil end";
+
+        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1,
+                             "ngx.req.get_headers __index");
+    }
+
+    if (rc != 0) {
+        ngx_log_error(NGX_LOG_ERR, log, 0,
+                      "failed to load Lua code of the metamethod for "
+                      "ngx.req.get_headers: %i: %s", rc, lua_tostring(L, -1));
+
+        lua_pop(L, 3);
+        return;
+    }
+
+    lua_setfield(L, -2, "__index");
+
+    lua_rawset(L, LUA_REGISTRYINDEX);
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers.h b/debian/modules/nginx-lua/src/ngx_http_lua_headers.h
index 61db082..b086d6f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.h
@@ -6,7 +6,7 @@
 
 
 void ngx_http_lua_inject_resp_header_api(lua_State *L);
-void ngx_http_lua_inject_req_header_api(lua_State *L);
+void ngx_http_lua_inject_req_header_api(ngx_log_t *log, lua_State *L);
 
 
 #endif /* NGX_HTTP_LUA_HEADERS_H */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_in.c b/debian/modules/nginx-lua/src/ngx_http_lua_headers_in.c
index 8299818..44b6a00 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers_in.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers_in.c
@@ -14,32 +14,23 @@
 
 static ngx_int_t ngx_http_set_header(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
 static ngx_int_t ngx_http_set_header_helper(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value,
     ngx_table_elt_t **output_header,
     unsigned no_create);
-
 static ngx_int_t ngx_http_set_builtin_header(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
 static ngx_int_t ngx_http_set_content_length_header(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
 static ngx_int_t ngx_http_clear_builtin_header(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
 static ngx_int_t ngx_http_clear_content_length_header(ngx_http_request_t *r,
         ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
 static ngx_int_t ngx_http_set_host_header(ngx_http_request_t *r,
         ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
 static ngx_int_t ngx_http_lua_rm_header_helper(ngx_list_t *l,
         ngx_list_part_t *cur, ngx_uint_t i);
 
-static ngx_int_t ngx_http_lua_rm_header(ngx_list_t *l, ngx_table_elt_t *h);
-
 
 static ngx_http_lua_set_header_t ngx_http_lua_set_handlers[] = {
 
@@ -129,12 +120,11 @@ ngx_http_set_header_helper(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
         goto new_header;
     }
 
+retry:
     part = &r->headers_in.headers.part;
     h = part->elts;
 
     for (i = 0; /* void */; i++) {
-        dd("i: %d, part: %p", (int) i, part);
-
         if (i >= part->nelts) {
             if (part->next == NULL) {
                 break;
@@ -145,6 +135,8 @@ ngx_http_set_header_helper(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
             i = 0;
         }
 
+        dd("i: %d, part: %p", (int) i, part);
+
         if (h[i].key.len == hv->key.len
                 && ngx_strncasecmp(h[i].key.data,
                     hv->key.data,
@@ -161,7 +153,7 @@ ngx_http_set_header_helper(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
                         *output_header = NULL;
                     }
 
-                    return NGX_OK;
+                    goto retry;
                 }
             }
 
@@ -177,7 +169,7 @@ ngx_http_set_header_helper(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
     }
 
     if (value->len == 0) {
-      return NGX_OK;
+        return NGX_OK;
     }
 
 new_header:
@@ -191,6 +183,7 @@ new_header:
 
     if (value->len == 0) {
         h->hash = 0;
+
     } else {
         h->hash = hv->hash;
     }
@@ -223,7 +216,6 @@ ngx_http_set_builtin_header(ngx_http_request_t *r,
         ngx_http_lua_header_val_t *hv, ngx_str_t *value)
 {
     ngx_table_elt_t             *h, **old;
-    ngx_int_t                    rc;
 
     dd("entered set_builtin_header (input)");
 
@@ -250,15 +242,7 @@ ngx_http_set_builtin_header(ngx_http_request_t *r,
         h->hash = 0;
         h->value = *value;
 
-        rc = ngx_http_lua_rm_header(&r->headers_in.headers, h);
-
-        dd("rm header: %d", (int) rc);
-
-        if (rc == NGX_OK) {
-            *old = NULL;
-        }
-
-        return rc;
+        return ngx_http_set_header_helper(r, hv, value, old, 0);
     }
 
     h->hash = hv->hash;
@@ -267,6 +251,7 @@ ngx_http_set_builtin_header(ngx_http_request_t *r,
     return NGX_OK;
 }
 
+
 static ngx_int_t
 ngx_http_set_host_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
         ngx_str_t *value)
@@ -278,6 +263,7 @@ ngx_http_set_host_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
     return ngx_http_set_builtin_header(r, hv, value);
 }
 
+
 static ngx_int_t
 ngx_http_set_content_length_header(ngx_http_request_t *r,
         ngx_http_lua_header_val_t *hv, ngx_str_t *value)
@@ -300,6 +286,7 @@ ngx_http_set_content_length_header(ngx_http_request_t *r,
     return ngx_http_set_builtin_header(r, hv, value);
 }
 
+
 static ngx_int_t
 ngx_http_clear_content_length_header(ngx_http_request_t *r,
         ngx_http_lua_header_val_t *hv, ngx_str_t *value)
@@ -309,6 +296,7 @@ ngx_http_clear_content_length_header(ngx_http_request_t *r,
     return ngx_http_clear_builtin_header(r, hv, value);
 }
 
+
 static ngx_int_t
 ngx_http_clear_builtin_header(ngx_http_request_t *r,
         ngx_http_lua_header_val_t *hv, ngx_str_t *value)
@@ -370,42 +358,6 @@ ngx_http_lua_set_input_header(ngx_http_request_t *r, ngx_str_t key,
 }
 
 
-static ngx_int_t
-ngx_http_lua_rm_header(ngx_list_t *l, ngx_table_elt_t *h)
-{
-    ngx_uint_t                   i;
-    ngx_list_part_t             *part;
-    ngx_table_elt_t             *data;
-
-    part = &l->part;
-    data = part->elts;
-
-    for (i = 0; /* void */; i++) {
-        dd("i: %d, part: %p", (int) i, part);
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            data = part->elts;
-
-            h = part->elts;
-            i = 0;
-        }
-
-        if (&data[i] == h) {
-            dd("found header");
-
-            return ngx_http_lua_rm_header_helper(l, part, i);
-        }
-    }
-
-    return NGX_ERROR;
-}
-
-
 static ngx_int_t
 ngx_http_lua_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
         ngx_uint_t i)
@@ -421,28 +373,32 @@ ngx_http_lua_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
     dd("cur: nelts %d, nalloc %d", (int) cur->nelts,
             (int) l->nalloc);
 
+    dd("removing: \"%.*s:%.*s\"", (int) data[i].key.len, data[i].key.data,
+            (int) data[i].value.len, data[i].value.data);
+
     if (i == 0) {
         cur->elts = (char *) cur->elts + l->size;
         cur->nelts--;
 
         if (cur == l->last) {
-            if (l->nalloc > 1) {
-                l->nalloc--;
-                return NGX_OK;
-            }
-
-            /* l->nalloc == 1 */
-
-            part = &l->part;
-            while (part->next != cur) {
-                if (part->next == NULL) {
-                    return NGX_ERROR;
+            if (cur->nelts == 0) {
+#if 1
+                part = &l->part;
+                while (part->next != cur) {
+                    if (part->next == NULL) {
+                        return NGX_ERROR;
+                    }
+                    part = part->next;
                 }
-                part = part->next;
-            }
 
-            part->next = NULL;
-            l->last = part;
+                l->last = part;
+                part->next = NULL;
+                l->nalloc = part->nelts;
+#endif
+
+            } else {
+                l->nalloc = cur->nelts;
+            }
 
             return NGX_OK;
         }
@@ -465,15 +421,19 @@ ngx_http_lua_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
     }
 
     if (i == cur->nelts - 1) {
+        dd("last entry in the part");
+
         cur->nelts--;
 
         if (cur == l->last) {
-            l->nalloc--;
+            l->nalloc = cur->nelts;
         }
 
         return NGX_OK;
     }
 
+    dd("the middle entry in the part");
+
     new = ngx_palloc(l->pool, sizeof(ngx_list_part_t));
     if (new == NULL) {
         return NGX_ERROR;
@@ -483,12 +443,12 @@ ngx_http_lua_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
     new->nelts = cur->nelts - i - 1;
     new->next = cur->next;
 
-    l->nalloc = new->nelts;
-
     cur->nelts = i;
     cur->next = new;
+
     if (cur == l->last) {
         l->last = new;
+        l->nalloc = new->nelts;
     }
 
     return NGX_OK;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initby.c b/debian/modules/nginx-lua/src/ngx_http_lua_initby.c
new file mode 100644
index 0000000..375885c
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_initby.c
@@ -0,0 +1,81 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+
+#include "ddebug.h"
+#include "ngx_http_lua_initby.h"
+#include "ngx_http_lua_util.h"
+
+
+static int ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status);
+static int ngx_http_lua_do_call(ngx_log_t *log, lua_State *L);
+
+
+char ngx_http_lua_cf_log_key;
+
+
+int
+ngx_http_lua_init_by_inline(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
+        lua_State *L)
+{
+    int                           status;
+
+    status = luaL_loadbuffer(L, (char *) lmcf->init_src.data,
+                             lmcf->init_src.len, "init_by_lua")
+             || ngx_http_lua_do_call(log, L);
+
+    return ngx_http_lua_report(log, L, status);
+}
+
+
+int
+ngx_http_lua_init_by_file(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
+        lua_State *L)
+{
+    int                           status;
+
+    status = luaL_loadfile(L, (char *) lmcf->init_src.data)
+             || ngx_http_lua_do_call(log, L);
+
+    return ngx_http_lua_report(log, L, status);
+}
+
+
+static int
+ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status)
+{
+    const char      *msg;
+
+    if (status && !lua_isnil(L, -1)) {
+        msg = lua_tostring(L, -1);
+        if (msg == NULL) {
+            msg = "unknown error";
+        }
+
+        ngx_log_error(NGX_LOG_ERR, log, 0, "failed to run init_by_lua*: %s",
+                      msg);
+        lua_pop(L, 1);
+    }
+
+    /* force a full garbage-collection cycle */
+    lua_gc(L, LUA_GCCOLLECT, 0);
+
+    return status;
+}
+
+
+static int
+ngx_http_lua_do_call(ngx_log_t *log, lua_State *L)
+{
+    int status;
+    int base;
+
+    base = lua_gettop(L);  /* function index */
+    lua_pushcfunction(L, ngx_http_lua_traceback);  /* push traceback function */
+    lua_insert(L, base);  /* put it under chunk and args */
+    status = lua_pcall(L, 0, 0, base);
+    lua_remove(L, base);
+
+    return status;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initby.h b/debian/modules/nginx-lua/src/ngx_http_lua_initby.h
new file mode 100644
index 0000000..cebbff1
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_initby.h
@@ -0,0 +1,16 @@
+#ifndef NGX_HTTP_LUA_INITBY_H
+#define NGX_HTTP_LUA_INITBY_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+int ngx_http_lua_init_by_inline(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
+        lua_State *L);
+
+int ngx_http_lua_init_by_file(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
+        lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_INITBY_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log.c b/debian/modules/nginx-lua/src/ngx_http_lua_log.c
index 26e266a..18258d0 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_log.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_log.c
@@ -4,13 +4,14 @@
 #include "ddebug.h"
 
 #include "ngx_http_lua_log.h"
+#include "ngx_http_lua_util.h"
 
 
 static int ngx_http_lua_print(lua_State *L);
 static int ngx_http_lua_ngx_log(lua_State *L);
 
 
-static int log_wrapper(ngx_http_request_t *r, const char *ident,
+static int log_wrapper(ngx_log_t *log, const char *ident,
         ngx_uint_t level, lua_State *L);
 
 static void ngx_http_lua_inject_log_consts(lua_State *L);
@@ -26,30 +27,41 @@ static void ngx_http_lua_inject_log_consts(lua_State *L);
 int
 ngx_http_lua_ngx_log(lua_State *L)
 {
+    ngx_log_t                   *log;
     ngx_http_request_t          *r;
+    const char                  *msg;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     if (r && r->connection && r->connection->log) {
-        int level = luaL_checkint(L, 1);
+        log = r->connection->log;
 
-        /* remove log-level param from stack */
-        lua_remove(L, 1);
-
-        return log_wrapper(r, "[lua] ", (ngx_uint_t) level, L);
+    } else {
+        lua_pushlightuserdata(L, &ngx_http_lua_cf_log_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+        log = lua_touserdata(L, -1);
+        lua_pop(L, 1);
     }
 
-    dd("(lua-log) can't output log due to invalid logging context!");
+    int level = luaL_checkint(L, 1);
+    if (level < NGX_LOG_STDERR || level > NGX_LOG_DEBUG) {
+        msg = lua_pushfstring(L, "bad log level: %d", level);
+        return luaL_argerror(L, 1, msg);
+    }
 
-    return 0;
+    /* remove log-level param from stack */
+    lua_remove(L, 1);
+
+    return log_wrapper(log, "[lua] ", (ngx_uint_t) level, L);
 }
 
 
 /**
  * Override Lua print function, output message to nginx error logs. Equal to
- * ngx.log(ngx.ERR, ...).
+ * ngx.log(ngx.NOTICE, ...).
  *
  * @param L Lua state pointer
  * @retval always 0 (don't return values to Lua)
@@ -57,26 +69,30 @@ ngx_http_lua_ngx_log(lua_State *L)
 int
 ngx_http_lua_print(lua_State *L)
 {
+    ngx_log_t                   *log;
     ngx_http_request_t          *r;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     if (r && r->connection && r->connection->log) {
-        return log_wrapper(r, "[lua] ", NGX_LOG_NOTICE, L);
+        log = r->connection->log;
 
     } else {
-        dd("(lua-print) can't output print content to error log due "
-                "to invalid logging context!");
+        lua_pushlightuserdata(L, &ngx_http_lua_cf_log_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+        log = lua_touserdata(L, -1);
+        lua_pop(L, 1);
     }
 
-    return 0;
+    return log_wrapper(log, "[lua] ", NGX_LOG_NOTICE, L);
 }
 
 
 static int
-log_wrapper(ngx_http_request_t *r, const char *ident, ngx_uint_t level,
+log_wrapper(ngx_log_t *log, const char *ident, ngx_uint_t level,
         lua_State *L)
 {
     u_char              *buf;
@@ -89,7 +105,7 @@ log_wrapper(ngx_http_request_t *r, const char *ident, ngx_uint_t level,
     const char          *msg;
     lua_Debug            ar;
 
-    if (level > r->connection->log->log_level) {
+    if (level > log->log_level) {
         return 0;
     }
 
@@ -165,7 +181,7 @@ log_wrapper(ngx_http_request_t *r, const char *ident, ngx_uint_t level,
         }
     }
 
-    buf = lua_newuserdata(L, size + 1);
+    buf = lua_newuserdata(L, size);
 
     p = ngx_copy(buf, name.data, name.len);
 
@@ -229,14 +245,12 @@ log_wrapper(ngx_http_request_t *r, const char *ident, ngx_uint_t level,
         }
     }
 
-    *p++ = '\0';
-
-    if (p - buf > (off_t) (size + 1)) {
+    if (p - buf > (off_t) size) {
         return luaL_error(L, "buffer error: %d > %d", (int) (p - buf),
-                          (int) (size + 1));
+                          (int) size);
     }
 
-    ngx_log_error(level, r->connection->log, 0, "%s%s", ident, buf);
+    ngx_log_error(level, log, 0, "%s%*s", ident, (size_t) (p - buf), buf);
 
     return 0;
 }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
new file mode 100644
index 0000000..d0773d5
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
@@ -0,0 +1,266 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_lua_directive.h"
+#include "ngx_http_lua_logby.h"
+#include "ngx_http_lua_exception.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pcrefix.h"
+#include "ngx_http_lua_time.h"
+#include "ngx_http_lua_log.h"
+#include "ngx_http_lua_regex.h"
+#include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_headers.h"
+#include "ngx_http_lua_variable.h"
+#include "ngx_http_lua_string.h"
+#include "ngx_http_lua_misc.h"
+#include "ngx_http_lua_consts.h"
+#include "ngx_http_lua_shdict.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_exception.h"
+
+
+static ngx_int_t ngx_http_lua_log_by_chunk(lua_State *L, ngx_http_request_t *r);
+
+
+static void
+ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
+{
+    /*  set nginx request pointer to current lua thread's globals table */
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_pushlightuserdata(L, r);
+    lua_rawset(L, LUA_GLOBALSINDEX);
+
+    /**
+     * we want to create empty environment for current script
+     *
+	 * newt = {}
+	 * newt["_G"] = newt
+     * setmetatable(newt, {__index = _G})
+     *
+     * if a function or symbol is not defined in our env, __index will lookup
+     * in the global env.
+     *
+     * all variables created in the script-env will be thrown away at the end
+     * of the script run.
+     * */
+    ngx_http_lua_create_new_global_table(L, 0 /* narr */, 1 /* nrec */);
+
+    /*  {{{ make new env inheriting main thread's globals table */
+    lua_newtable(L);    /*  the metatable for the new env */
+    lua_pushvalue(L, LUA_GLOBALSINDEX);
+    lua_setfield(L, -2, "__index");
+    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
+    /*  }}} */
+
+    lua_setfenv(L, -2);    /*  set new running env for the code closure */
+}
+
+
+ngx_int_t
+ngx_http_lua_log_handler(ngx_http_request_t *r)
+{
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf;
+    ngx_int_t                    rc;
+    lua_State                   *L;
+    ngx_http_lua_ctx_t          *ctx;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+            "lua log handler, uri \"%V\"", &r->uri);
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->log_handler == NULL) {
+        dd("no log handler found");
+        return NGX_DECLINED;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    dd("ctx = %p", ctx);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    ctx->context = NGX_HTTP_LUA_CONTEXT_LOG;
+
+    dd("calling log handler");
+    rc = llcf->log_handler(r);
+
+    /* we must release the ngx.ctx table here because request cleanup runs
+     * before log phase handlers */
+
+    if (ctx->ctx_ref != LUA_NOREF) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua release ngx.ctx");
+
+        lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+        L = lmcf->lua;
+
+        lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+
+        luaL_unref(L, -1, ctx->ctx_ref);
+        ctx->ctx_ref = LUA_NOREF;
+        lua_pop(L, 1);
+    }
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_http_lua_log_handler_inline(ngx_http_request_t *r)
+{
+    lua_State                   *L;
+    ngx_int_t                    rc;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_loc_conf_t     *llcf;
+    char                        *err;
+
+    dd("log by lua inline");
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    L = lmcf->lua;
+
+    /*  load Lua inline script (w/ cache) sp = 1 */
+    rc = ngx_http_lua_cache_loadbuffer(L, llcf->log_src.value.data,
+            llcf->log_src.value.len, llcf->log_src_key,
+            "log_by_lua", &err, llcf->enable_code_cache ? 1 : 0);
+
+    if (rc != NGX_OK) {
+        if (err == NULL) {
+            err = "unknown error";
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "failed to load Lua inlined code: %s", err);
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    return ngx_http_lua_log_by_chunk(L, r);
+}
+
+
+ngx_int_t
+ngx_http_lua_log_handler_file(ngx_http_request_t *r)
+{
+    lua_State                       *L;
+    ngx_int_t                        rc;
+    u_char                          *script_path;
+    ngx_http_lua_main_conf_t        *lmcf;
+    ngx_http_lua_loc_conf_t         *llcf;
+    char                            *err;
+    ngx_str_t                        eval_src;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (ngx_http_complex_value(r, &llcf->log_src, &eval_src) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    script_path = ngx_http_lua_rebase_path(r->pool, eval_src.data,
+            eval_src.len);
+
+    if (script_path == NULL) {
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    L = lmcf->lua;
+
+    /*  load Lua script file (w/ cache)        sp = 1 */
+    rc = ngx_http_lua_cache_loadfile(L, script_path, llcf->log_src_key,
+            &err, llcf->enable_code_cache ? 1 : 0);
+
+    if (rc != NGX_OK) {
+        if (err == NULL) {
+            err = "unknown error";
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "failed to load Lua file code: %s", err);
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    return ngx_http_lua_log_by_chunk(L, r);
+}
+
+
+ngx_int_t
+ngx_http_lua_log_by_chunk(lua_State *L, ngx_http_request_t *r)
+{
+    ngx_int_t        rc;
+    u_char          *err_msg;
+    size_t           len;
+#if (NGX_PCRE)
+    ngx_pool_t      *old_pool;
+#endif
+
+    /*  set Lua VM panic handler */
+    lua_atpanic(L, ngx_http_lua_atpanic);
+
+    NGX_LUA_EXCEPTION_TRY {
+
+        /* initialize nginx context in Lua VM, code chunk at stack top sp = 1 */
+        ngx_http_lua_log_by_lua_env(L, r);
+
+#if (NGX_PCRE)
+        /* XXX: work-around to nginx regex subsystem */
+        old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
+#endif
+
+        lua_pushcfunction(L, ngx_http_lua_traceback);
+        lua_insert(L, 1);  /* put it under chunk and args */
+
+        /*  protected call user code */
+        rc = lua_pcall(L, 0, 1, 1);
+
+        lua_remove(L, 1);  /* remove traceback function */
+
+#if (NGX_PCRE)
+        /* XXX: work-around to nginx regex subsystem */
+        ngx_http_lua_pcre_malloc_done(old_pool);
+#endif
+
+        if (rc != 0) {
+            /*  error occured when running loaded code */
+            err_msg = (u_char *) lua_tolstring(L, -1, &len);
+
+            if (err_msg == NULL) {
+                err_msg = (u_char *) "unknown reason";
+                len = sizeof("unknown reason") - 1;
+            }
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "failed to run log_by_lua*: %*s", len, err_msg);
+
+            lua_settop(L, 0);    /*  clear remaining elems on stack */
+
+            return NGX_ERROR;
+        }
+
+    } NGX_LUA_EXCEPTION_CATCH {
+
+        dd("nginx execution restored");
+        return NGX_ERROR;
+    }
+
+    /*  clear Lua stack */
+    lua_settop(L, 0);
+
+    return NGX_OK;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.h b/debian/modules/nginx-lua/src/ngx_http_lua_logby.h
new file mode 100644
index 0000000..01a941b
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_logby.h
@@ -0,0 +1,18 @@
+#ifndef NGX_HTTP_LUA_LOGBY_H
+#define NGX_HTTP_LUA_LOGBY_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+ngx_int_t ngx_http_lua_log_handler(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_lua_log_handler_inline(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_lua_log_handler_file(ngx_http_request_t *r);
+
+void ngx_http_lua_inject_logby_ngx_api(ngx_conf_t *cf, lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_LOGBY_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_misc.c b/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
index 0d0f0f9..62e316d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
@@ -5,6 +5,7 @@
 
 #include "ngx_http_lua_misc.h"
 #include "ngx_http_lua_ctx.h"
+#include "ngx_http_lua_util.h"
 
 
 static int ngx_http_lua_ngx_get(lua_State *L);
@@ -32,7 +33,8 @@ ngx_http_lua_ngx_get(lua_State *L)
     size_t                       len;
     ngx_http_lua_ctx_t          *ctx;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -90,7 +92,8 @@ ngx_http_lua_ngx_set(lua_State *L)
     size_t                       len;
     ngx_http_lua_ctx_t          *ctx;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -107,8 +110,10 @@ ngx_http_lua_ngx_set(lua_State *L)
         ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
         if (ctx->headers_sent) {
-            return luaL_error(L, "attempt to set ngx.status after "
-                    "sending out response headers");
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "attempt to set ngx.status after sending out "
+                          "response headers");
+            return 0;
         }
 
         /* get the value */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_module.c b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
index d1c2cf5..0f9894a 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -1,12 +1,21 @@
 /* vim:set ft=c ts=4 sw=4 et fdm=marker: */
 
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
 #include "ngx_http_lua_directive.h"
-#include "ngx_http_lua_conf.h"
 #include "ngx_http_lua_capturefilter.h"
 #include "ngx_http_lua_contentby.h"
 #include "ngx_http_lua_rewriteby.h"
 #include "ngx_http_lua_accessby.h"
+#include "ngx_http_lua_logby.h"
+#include "ngx_http_lua_util.h"
 #include "ngx_http_lua_headerfilterby.h"
+#include "ngx_http_lua_bodyfilterby.h"
+#include "ngx_http_lua_initby.h"
+#include "ngx_http_lua_probe.h"
 
 
 #if !defined(nginx_version) || nginx_version < 8054
@@ -14,9 +23,16 @@
 #endif
 
 
+static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
+static char *ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf);
+static void *ngx_http_lua_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_lua_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_http_lua_init_vm(ngx_conf_t *cf,
+    ngx_http_lua_main_conf_t *lmcf);
+static void ngx_http_lua_cleanup_vm(void *data);
 static ngx_int_t ngx_http_lua_init(ngx_conf_t *cf);
-static ngx_int_t ngx_http_lua_pre_config(ngx_conf_t *cf);
-static char * ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data);
+static char *ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data);
 
 
 static ngx_conf_post_t  ngx_http_lua_lowat_post =
@@ -71,11 +87,41 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       offsetof(ngx_http_lua_loc_conf_t, force_read_body),
       NULL },
 
+    { ngx_string("lua_transform_underscores_in_response_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_lua_loc_conf_t, transform_underscores_in_resp_headers),
+      NULL },
+
+     { ngx_string("lua_socket_log_errors"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
+      NULL },
+
+    { ngx_string("init_by_lua"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_init_by_lua,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      ngx_http_lua_init_by_inline },
+
+    { ngx_string("init_by_lua_file"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_init_by_lua,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      ngx_http_lua_init_by_file },
+
 #if defined(NDK) && NDK
     /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
     { ngx_string("set_by_lua"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF
-                        |NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
+      NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                       |NGX_CONF_2MORE,
       ngx_http_lua_set_by_lua,
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
@@ -83,8 +129,8 @@ static ngx_command_t ngx_http_lua_cmds[] = {
 
     /* set_by_lua_file $res rel/or/abs/path/to/script [$arg1 [$arg2 [..]]] */
     { ngx_string("set_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF
-                        |NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
+      NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                       |NGX_CONF_2MORE,
       ngx_http_lua_set_by_lua_file,
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
@@ -117,14 +163,14 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       ngx_http_lua_content_handler_inline },
 
-    /* header_filter_by_lua <inline script> */
-    { ngx_string("header_filter_by_lua"),
+    /* log_by_lua <inline script> */
+    { ngx_string("log_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
-      ngx_http_lua_header_filter_by_lua,
+      ngx_http_lua_log_by_lua,
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
-      ngx_http_lua_header_filter_inline },
+      ngx_http_lua_log_handler_inline },
 
     { ngx_string("rewrite_by_lua_file"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
@@ -158,6 +204,23 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       ngx_http_lua_content_handler_file },
 
+    { ngx_string("log_by_lua_file"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_TAKE1,
+      ngx_http_lua_log_by_lua,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      ngx_http_lua_log_handler_file },
+
+    /* header_filter_by_lua <inline script> */
+    { ngx_string("header_filter_by_lua"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_TAKE1,
+      ngx_http_lua_header_filter_by_lua,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      ngx_http_lua_header_filter_inline },
+
     { ngx_string("header_filter_by_lua_file"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
@@ -166,6 +229,22 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       ngx_http_lua_header_filter_file },
 
+    { ngx_string("body_filter_by_lua"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_TAKE1,
+      ngx_http_lua_body_filter_by_lua,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      ngx_http_lua_body_filter_inline },
+
+    { ngx_string("body_filter_by_lua_file"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_TAKE1,
+      ngx_http_lua_body_filter_by_lua,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      ngx_http_lua_body_filter_file },
+
     { ngx_string("lua_socket_keepalive_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
           |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -230,11 +309,20 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       offsetof(ngx_http_lua_loc_conf_t, http10_buffering),
       NULL },
 
+    { ngx_string("lua_check_client_abort"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_lua_loc_conf_t, check_client_abort),
+      NULL },
+
     ngx_null_command
 };
 
+
 ngx_http_module_t ngx_http_lua_module_ctx = {
-    ngx_http_lua_pre_config,          /*  preconfiguration */
+    NULL,                             /*  preconfiguration */
     ngx_http_lua_init,                /*  postconfiguration */
 
     ngx_http_lua_create_main_conf,    /*  create main configuration */
@@ -272,20 +360,22 @@ ngx_http_lua_init(ngx_conf_t *cf)
     ngx_http_core_main_conf_t  *cmcf;
     ngx_http_lua_main_conf_t   *lmcf;
 
-    rc = ngx_http_lua_capture_filter_init(cf);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
 
+    if (lmcf->requires_capture_filter) {
+        rc = ngx_http_lua_capture_filter_init(cf);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
     if (lmcf->postponed_to_rewrite_phase_end == NGX_CONF_UNSET) {
         lmcf->postponed_to_rewrite_phase_end = 0;
     }
 
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
-    if (ngx_http_lua_requires_rewrite) {
+    if (lmcf->requires_rewrite) {
         h = ngx_array_push(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers);
         if (h == NULL) {
             return NGX_ERROR;
@@ -294,7 +384,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
         *h = ngx_http_lua_rewrite_handler;
     }
 
-    if (ngx_http_lua_requires_access) {
+    if (lmcf->requires_access) {
         h = ngx_array_push(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers);
         if (h == NULL) {
             return NGX_ERROR;
@@ -303,24 +393,49 @@ ngx_http_lua_init(ngx_conf_t *cf)
         *h = ngx_http_lua_access_handler;
     }
 
-    if (ngx_http_lua_requires_header_filter) {
+    dd("requires log: %d", (int) lmcf->requires_log);
+
+    if (lmcf->requires_log) {
+        h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers);
+        if (h == NULL) {
+            return NGX_ERROR;
+        }
+
+        *h = ngx_http_lua_log_handler;
+    }
+
+    if (lmcf->requires_header_filter) {
         rc = ngx_http_lua_header_filter_init();
         if (rc != NGX_OK) {
             return rc;
         }
     }
 
-    return NGX_OK;
-}
+    if (lmcf->requires_body_filter) {
+        rc = ngx_http_lua_body_filter_init();
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
 
+    if (lmcf->lua == NULL) {
+        dd("initializing lua vm");
 
-static ngx_int_t
-ngx_http_lua_pre_config(ngx_conf_t *cf)
-{
-    ngx_http_lua_requires_rewrite = 0;
-    ngx_http_lua_requires_access = 0;
-    ngx_http_lua_requires_header_filter = 0;
-    ngx_http_lua_requires_capture_filter = 0;
+        if (ngx_http_lua_init_vm(cf, lmcf) != NGX_CONF_OK) {
+            ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
+                               "failed to initialize Lua VM");
+            return NGX_ERROR;
+        }
+
+        if (!lmcf->requires_shm && lmcf->init_handler) {
+            if (lmcf->init_handler(cf->log, lmcf, lmcf->lua) != 0) {
+                /* an error happened */
+                return NGX_ERROR;
+            }
+        }
+
+        dd("Lua VM initialized!");
+    }
 
     return NGX_OK;
 }
@@ -354,3 +469,254 @@ ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data)
     return NGX_CONF_OK;
 }
 
+
+static void *
+ngx_http_lua_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_main_conf_t));
+    if (lmcf == NULL) {
+        return NULL;
+    }
+
+    /* set by ngx_pcalloc:
+     *      lmcf->lua = NULL;
+     *      lmcf->lua_path = { 0, NULL };
+     *      lmcf->lua_cpath = { 0, NULL };
+     *      lmcf->regex_cache_entries = 0;
+     *      lmcf->shm_zones = NULL;
+     *      lmcf->init_handler = NULL;
+     *      lmcf->init_src = { 0, NULL };
+     *      lmcf->shm_zones_inited = 0;
+     *      lmcf->preload_hooks = NULL;
+     *      lmcf->requires_header_filter = 0;
+     *      lmcf->requires_body_filter = 0;
+     *      lmcf->requires_capture_filter = 0;
+     *      lmcf->requires_rewrite = 0;
+     *      lmcf->requires_access = 0;
+     *      lmcf->requires_log = 0;
+     *      lmcf->requires_shm = 0;
+     */
+
+    lmcf->pool = cf->pool;
+#if (NGX_PCRE)
+    lmcf->regex_cache_max_entries = NGX_CONF_UNSET;
+#endif
+    lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
+
+    dd("nginx Lua module main config structure initialized!");
+
+    return lmcf;
+}
+
+
+static char *
+ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
+{
+#if (NGX_PCRE)
+    ngx_http_lua_main_conf_t *lmcf = conf;
+
+    if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
+        lmcf->regex_cache_max_entries = 1024;
+    }
+#endif
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_http_lua_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_lua_loc_conf_t *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_loc_conf_t));
+    if (conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* set by ngx_pcalloc:
+     *      conf->access_src  = {{ 0, NULL }, NULL, NULL, NULL};
+     *      conf->access_src_key = NULL
+     *      conf->rewrite_src = {{ 0, NULL }, NULL, NULL, NULL};
+     *      conf->rewrite_src_key = NULL
+     *      conf->rewrite_handler = NULL;
+     *
+     *      conf->content_src = {{ 0, NULL }, NULL, NULL, NULL};
+     *      conf->content_src_key = NULL
+     *      conf->content_handler = NULL;
+     *
+     *      conf->log_src = {{ 0, NULL }, NULL, NULL, NULL};
+     *      conf->log_src_key = NULL
+     *      conf->log_handler = NULL;
+     *
+     *      conf->header_filter_src = {{ 0, NULL }, NULL, NULL, NULL};
+     *      conf->header_filter_src_key = NULL
+     *      conf->header_filter_handler = NULL;
+     *
+     *      conf->body_filter_src = {{ 0, NULL }, NULL, NULL, NULL};
+     *      conf->body_filter_src_key = NULL
+     *      conf->body_filter_handler = NULL;
+     */
+
+    conf->force_read_body    = NGX_CONF_UNSET;
+    conf->enable_code_cache  = NGX_CONF_UNSET;
+    conf->http10_buffering   = NGX_CONF_UNSET;
+    conf->check_client_abort = NGX_CONF_UNSET;
+
+    conf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
+    conf->connect_timeout = NGX_CONF_UNSET_MSEC;
+    conf->send_timeout = NGX_CONF_UNSET_MSEC;
+    conf->read_timeout = NGX_CONF_UNSET_MSEC;
+    conf->send_lowat = NGX_CONF_UNSET_SIZE;
+    conf->buffer_size = NGX_CONF_UNSET_SIZE;
+    conf->pool_size = NGX_CONF_UNSET_UINT;
+
+    conf->transform_underscores_in_resp_headers = NGX_CONF_UNSET;
+    conf->log_socket_errors = NGX_CONF_UNSET;
+
+
+    return conf;
+}
+
+
+static char *
+ngx_http_lua_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_lua_loc_conf_t *prev = parent;
+    ngx_http_lua_loc_conf_t *conf = child;
+
+    if (conf->rewrite_src.value.len == 0) {
+        conf->rewrite_src = prev->rewrite_src;
+        conf->rewrite_handler = prev->rewrite_handler;
+        conf->rewrite_src_key = prev->rewrite_src_key;
+    }
+
+    if (conf->access_src.value.len == 0) {
+        conf->access_src = prev->access_src;
+        conf->access_handler = prev->access_handler;
+        conf->access_src_key = prev->access_src_key;
+    }
+
+    if (conf->content_src.value.len == 0) {
+        conf->content_src = prev->content_src;
+        conf->content_handler = prev->content_handler;
+        conf->content_src_key = prev->content_src_key;
+    }
+
+    if (conf->log_src.value.len == 0) {
+        conf->log_src = prev->log_src;
+        conf->log_handler = prev->log_handler;
+        conf->log_src_key = prev->log_src_key;
+    }
+
+    if (conf->header_filter_src.value.len == 0) {
+        conf->header_filter_src = prev->header_filter_src;
+        conf->header_filter_handler = prev->header_filter_handler;
+        conf->header_filter_src_key = prev->header_filter_src_key;
+    }
+
+    if (conf->body_filter_src.value.len == 0) {
+        conf->body_filter_src = prev->body_filter_src;
+        conf->body_filter_handler = prev->body_filter_handler;
+        conf->body_filter_src_key = prev->body_filter_src_key;
+    }
+
+    ngx_conf_merge_value(conf->force_read_body, prev->force_read_body, 0);
+    ngx_conf_merge_value(conf->enable_code_cache, prev->enable_code_cache, 1);
+    ngx_conf_merge_value(conf->http10_buffering, prev->http10_buffering, 1);
+    ngx_conf_merge_value(conf->check_client_abort, prev->check_client_abort, 0);
+
+    ngx_conf_merge_msec_value(conf->keepalive_timeout,
+                              prev->keepalive_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->connect_timeout,
+                              prev->connect_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->send_timeout,
+                              prev->send_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->read_timeout,
+                              prev->read_timeout, 60000);
+
+    ngx_conf_merge_size_value(conf->send_lowat,
+                              prev->send_lowat, 0);
+
+    ngx_conf_merge_size_value(conf->buffer_size,
+                              prev->buffer_size,
+                              (size_t) ngx_pagesize);
+
+    ngx_conf_merge_uint_value(conf->pool_size, prev->pool_size, 30);
+
+    ngx_conf_merge_value(conf->transform_underscores_in_resp_headers,
+                         prev->transform_underscores_in_resp_headers, 1);
+
+    ngx_conf_merge_value(conf->log_socket_errors, prev->log_socket_errors, 1);
+
+    return NGX_CONF_OK;
+}
+
+
+static void
+ngx_http_lua_cleanup_vm(void *data)
+{
+    lua_State *L = data;
+
+    if (L != NULL) {
+        lua_close(L);
+
+        dd("Lua VM closed!");
+    }
+}
+
+
+static char *
+ngx_http_lua_init_vm(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
+{
+    ngx_pool_cleanup_t              *cln;
+    ngx_http_lua_preload_hook_t     *hook;
+    lua_State                       *L;
+    ngx_uint_t                       i;
+
+    /* add new cleanup handler to config mem pool */
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* create new Lua VM instance */
+    lmcf->lua = ngx_http_lua_new_state(cf, lmcf);
+    if (lmcf->lua == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* register cleanup handler for Lua VM */
+    cln->handler = ngx_http_lua_cleanup_vm;
+    cln->data = lmcf->lua;
+
+    if (lmcf->preload_hooks) {
+
+        /* register the 3rd-party module's preload hooks */
+
+        L = lmcf->lua;
+
+        lua_getglobal(L, "package");
+        lua_getfield(L, -1, "preload");
+
+        hook = lmcf->preload_hooks->elts;
+
+        for (i = 0; i < lmcf->preload_hooks->nelts; i++) {
+
+            ngx_http_lua_probe_register_preload_package(L, hook[i].package);
+
+            lua_pushcfunction(L, hook[i].loader);
+            lua_setfield(L, -2, (char *) hook[i].package);
+        }
+
+        lua_pop(L, 2);
+    }
+
+    return NGX_CONF_OK;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c b/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c
index 2b089f6..76f135f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c
@@ -5,6 +5,7 @@
 
 
 #include "ngx_http_lua_ndk.h"
+#include "ngx_http_lua_util.h"
 
 
 #if defined(NDK) && NDK
@@ -84,7 +85,8 @@ ngx_http_lua_run_set_var_directive(lua_State *L)
     arg.data = (u_char *) luaL_checklstring(L, 1, &len);
     arg.len = len;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_output.c b/debian/modules/nginx-lua/src/ngx_http_lua_output.c
index cf201db..a2088a4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_output.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_output.c
@@ -15,6 +15,7 @@ static int ngx_http_lua_ngx_flush(lua_State *L);
 static int ngx_http_lua_ngx_eof(lua_State *L);
 static int ngx_http_lua_ngx_send_headers(lua_State *L);
 static int ngx_http_lua_ngx_echo(lua_State *L, unsigned newline);
+static void ngx_http_lua_flush_cleanup(void *data);
 
 
 static int
@@ -50,7 +51,8 @@ ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
     const char                  *msg;
     ngx_buf_tag_t                tag;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -64,6 +66,10 @@ ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
         return luaL_error(L, "no request ctx found");
     }
 
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
     if (r->header_only) {
         return 0;
     }
@@ -105,7 +111,8 @@ ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
 
             case LUA_TTABLE:
 
-                size += ngx_http_lua_calc_strlen_in_table(L, i, 0);
+                size += ngx_http_lua_calc_strlen_in_table(L, i, i,
+                                                          0 /* strict */);
                 break;
 
             case LUA_TLIGHTUSERDATA:
@@ -182,7 +189,7 @@ ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
                 break;
 
             case LUA_TTABLE:
-                b->last = ngx_http_lua_copy_str_in_table(L, b->last);
+                b->last = ngx_http_lua_copy_str_in_table(L, i, b->last);
                 break;
 
             case LUA_TLIGHTUSERDATA:
@@ -237,7 +244,8 @@ ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
 
 
 size_t
-ngx_http_lua_calc_strlen_in_table(lua_State *L, int arg_i, unsigned strict)
+ngx_http_lua_calc_strlen_in_table(lua_State *L, int index, int arg_i,
+    unsigned strict)
 {
     double              key;
     int                 max;
@@ -247,11 +255,24 @@ ngx_http_lua_calc_strlen_in_table(lua_State *L, int arg_i, unsigned strict)
     size_t              len;
     const char         *msg;
 
+    if (index < 0) {
+        index = lua_gettop(L) + index + 1;
+    }
+
+    dd("table index: %d", index);
+
     max = 0;
 
     lua_pushnil(L); /* stack: table key */
-    while (lua_next(L, -2) != 0) { /* stack: table key value */
-        if (lua_type(L, -2) == LUA_TNUMBER && (key = lua_tonumber(L, -2))) {
+    while (lua_next(L, index) != 0) { /* stack: table key value */
+        dd("key type: %s", luaL_typename(L, -2));
+
+        if (lua_type(L, -2) == LUA_TNUMBER) {
+
+            key = lua_tonumber(L, -2);
+
+            dd("key value: %d", (int) key);
+
             if (floor(key) == key && key >= 1) {
                 if (key > max) {
                     max = key;
@@ -273,7 +294,7 @@ ngx_http_lua_calc_strlen_in_table(lua_State *L, int arg_i, unsigned strict)
     size = 0;
 
     for (i = 1; i <= max; i++) {
-        lua_rawgeti(L, -1, i); /* stack: table value */
+        lua_rawgeti(L, index, i); /* stack: table value */
         type = lua_type(L, -1);
 
         switch (type) {
@@ -310,7 +331,7 @@ ngx_http_lua_calc_strlen_in_table(lua_State *L, int arg_i, unsigned strict)
 
             case LUA_TTABLE:
 
-                size += ngx_http_lua_calc_strlen_in_table(L, arg_i, strict);
+                size += ngx_http_lua_calc_strlen_in_table(L, -1, arg_i, strict);
                 break;
 
             case LUA_TLIGHTUSERDATA:
@@ -342,7 +363,7 @@ bad_type:
 
 
 u_char *
-ngx_http_lua_copy_str_in_table(lua_State *L, u_char *dst)
+ngx_http_lua_copy_str_in_table(lua_State *L, int index, u_char *dst)
 {
     double               key;
     int                  max;
@@ -351,10 +372,14 @@ ngx_http_lua_copy_str_in_table(lua_State *L, u_char *dst)
     size_t               len;
     u_char              *p;
 
+    if (index < 0) {
+        index = lua_gettop(L) + index + 1;
+    }
+
     max = 0;
 
     lua_pushnil(L); /* stack: table key */
-    while (lua_next(L, -2) != 0) { /* stack: table key value */
+    while (lua_next(L, index) != 0) { /* stack: table key value */
         key = lua_tonumber(L, -2);
         if (key > max) {
             max = key;
@@ -364,7 +389,7 @@ ngx_http_lua_copy_str_in_table(lua_State *L, u_char *dst)
     }
 
     for (i = 1; i <= max; i++) {
-        lua_rawgeti(L, -1, i); /* stack: table value */
+        lua_rawgeti(L, index, i); /* stack: table value */
         type = lua_type(L, -1);
         switch (type) {
             case LUA_TNUMBER:
@@ -397,7 +422,7 @@ ngx_http_lua_copy_str_in_table(lua_State *L, u_char *dst)
                 break;
 
             case LUA_TTABLE:
-                dst = ngx_http_lua_copy_str_in_table(L, dst);
+                dst = ngx_http_lua_copy_str_in_table(L, -1, dst);
                 break;
 
             case LUA_TLIGHTUSERDATA:
@@ -435,6 +460,7 @@ ngx_http_lua_ngx_flush(lua_State *L)
     unsigned                     wait = 0;
     ngx_event_t                 *wev;
     ngx_http_core_loc_conf_t    *clcf;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     n = lua_gettop(L);
     if (n > 1) {
@@ -442,7 +468,8 @@ ngx_http_lua_ngx_flush(lua_State *L)
                 "or 1", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -456,6 +483,15 @@ ngx_http_lua_ngx_flush(lua_State *L)
         return luaL_error(L, "no request ctx found");
     }
 
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    coctx = ctx->cur_co_ctx;
+    if (coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
+    }
+
     if (r->header_only) {
         return 0;
     }
@@ -508,7 +544,8 @@ ngx_http_lua_ngx_flush(lua_State *L)
                 "lua flush requires waiting: buffered 0x%uxd",
                 (int) r->connection->buffered);
 
-        ctx->waiting_flush = 1;
+        coctx->flushing = 1;
+        ctx->flushing_coros++;
 
         if (ctx->entered_content_phase) {
             /* mimic ngx_http_set_write_handler */
@@ -518,7 +555,7 @@ ngx_http_lua_ngx_flush(lua_State *L)
         wev = r->connection->write;
 
         if (wev->ready && wev->delayed) {
-            return lua_yield(L, 0);
+            return 0;
         }
 
         clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
@@ -528,9 +565,15 @@ ngx_http_lua_ngx_flush(lua_State *L)
         }
 
         if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+            if (wev->timer_set) {
+                ngx_del_timer(wev);
+            }
             return luaL_error(L, "connection broken");
         }
 
+        coctx->cleanup = ngx_http_lua_flush_cleanup;
+        coctx->data = r;
+
         return lua_yield(L, 0);
     }
 
@@ -551,7 +594,8 @@ ngx_http_lua_ngx_eof(lua_State *L)
     ngx_http_lua_ctx_t      *ctx;
     ngx_int_t                rc;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -564,6 +608,13 @@ ngx_http_lua_ngx_eof(lua_State *L)
     }
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua send eof");
@@ -607,25 +658,99 @@ ngx_http_lua_ngx_send_headers(lua_State *L)
     ngx_http_request_t      *r;
     ngx_http_lua_ctx_t      *ctx;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (r) {
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-        if (ctx && ctx->headers_sent == 0) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua send headers");
-
-            ngx_http_lua_send_header_if_needed(r, ctx);
-        }
-
-        return 0;
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
     }
 
-    dd("(lua-ngx-send-headers) can't find nginx request object!");
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    if (!ctx->headers_sent) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua send headers");
+
+        ngx_http_lua_send_header_if_needed(r, ctx);
+    }
 
     return 0;
 }
 
+
+ngx_int_t
+ngx_http_lua_flush_resume_helper(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
+{
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    c = r->connection;
+
+    ctx->cur_co_ctx->cleanup = NULL;
+
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    /* rc == NGX_ERROR || rc >= NGX_OK */
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_flush_cleanup(void *data)
+{
+    ngx_http_request_t                      *r;
+    ngx_event_t                             *wev;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_http_lua_co_ctx_t                   *coctx = data;
+
+    coctx->flushing = 0;
+
+    r = coctx->data;
+    if (r == NULL) {
+        return;
+    }
+
+    wev = r->connection->write;
+
+    if (wev && wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    ctx->flushing_coros--;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_output.h b/debian/modules/nginx-lua/src/ngx_http_lua_output.h
index 828f51f..72d3845 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_output.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_output.h
@@ -7,10 +7,13 @@
 
 void ngx_http_lua_inject_output_api(lua_State *L);
 
-size_t ngx_http_lua_calc_strlen_in_table(lua_State *L, int arg_i,
+size_t ngx_http_lua_calc_strlen_in_table(lua_State *L, int index, int arg_i,
     unsigned strict);
 
-u_char * ngx_http_lua_copy_str_in_table(lua_State *L, u_char *dst);
+u_char * ngx_http_lua_copy_str_in_table(lua_State *L, int index, u_char *dst);
+
+ngx_int_t ngx_http_lua_flush_resume_helper(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx);
 
 
 #endif /* NGX_HTTP_LUA_OUTPUT_H */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_phase.c b/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
new file mode 100644
index 0000000..fad6e44
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
@@ -0,0 +1,82 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_phase.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_ctx.h"
+
+
+static int ngx_http_lua_ngx_get_phase(lua_State *L);
+
+
+static int
+ngx_http_lua_ngx_get_phase(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    /* If we have no request object, assume we are called from the "init"
+     * phase. */
+
+    if (r == NULL) {
+        lua_pushlstring(L, (char *) "init", sizeof("init") - 1);
+        return 1;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    switch (ctx->context) {
+    case NGX_HTTP_LUA_CONTEXT_SET:
+        lua_pushliteral(L, "set");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_REWRITE:
+        lua_pushliteral(L, "rewrite");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_ACCESS:
+        lua_pushliteral(L, "access");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_CONTENT:
+        lua_pushliteral(L, "content");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_LOG:
+        lua_pushliteral(L, "log");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_HEADER_FILTER:
+        lua_pushliteral(L, "header_filter");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_BODY_FILTER:
+        lua_pushliteral(L, "body_filter");
+        break;
+
+    default:
+        return luaL_error(L, "unknown phase: %d", (int) ctx->context);
+    }
+
+    return 1;
+}
+
+
+void
+ngx_http_lua_inject_phase_api(lua_State *L)
+{
+    lua_pushcfunction(L, ngx_http_lua_ngx_get_phase);
+    lua_setfield(L, -2, "get_phase");
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_phase.h b/debian/modules/nginx-lua/src/ngx_http_lua_phase.h
new file mode 100644
index 0000000..f811932
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_phase.h
@@ -0,0 +1,11 @@
+#ifndef NGX_HTTP_LUA_PHASE_H
+#define NGX_HTTP_LUA_PHASE_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_phase_api(lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_PHASE_H */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_probe.h b/debian/modules/nginx-lua/src/ngx_http_lua_probe.h
new file mode 100644
index 0000000..c10eebf
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_probe.h
@@ -0,0 +1,85 @@
+/*
+ * automatically generated from the file dtrace/ngx_lua_provider.d by the
+ *  gen-dtrace-probe-header tool in the nginx-devel-utils project:
+ *  https://github.com/agentzh/nginx-devel-utils
+ */
+
+#ifndef NGX_HTTP_LUA_PROBE_H
+#define NGX_HTTP_LUA_PROBE_H
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#if defined(NGX_DTRACE) && NGX_DTRACE
+
+#include <ngx_dtrace_provider.h>
+
+#define ngx_http_lua_probe_info(s)                                           \
+    NGINX_LUA_HTTP_LUA_INFO(s)
+
+#define ngx_http_lua_probe_register_preload_package(L, pkg)                  \
+    NGINX_LUA_HTTP_LUA_REGISTER_PRELOAD_PACKAGE(L, pkg)
+
+#define ngx_http_lua_probe_req_socket_consume_preread(r, data, len)          \
+    NGINX_LUA_HTTP_LUA_REQ_SOCKET_CONSUME_PREREAD(r, data, len)
+
+#define ngx_http_lua_probe_user_coroutine_create(r, parent, child)           \
+    NGINX_LUA_HTTP_LUA_USER_COROUTINE_CREATE(r, parent, child)
+
+#define ngx_http_lua_probe_user_coroutine_resume(r, parent, child)           \
+    NGINX_LUA_HTTP_LUA_USER_COROUTINE_RESUME(r, parent, child)
+
+#define ngx_http_lua_probe_user_coroutine_yield(r, parent, child)            \
+    NGINX_LUA_HTTP_LUA_USER_COROUTINE_YIELD(r, parent, child)
+
+#define ngx_http_lua_probe_thread_yield(r, L)                                \
+    NGINX_LUA_HTTP_LUA_THREAD_YIELD(r, L)
+
+#define ngx_http_lua_probe_socket_tcp_send_start(r, u, data, len)            \
+    NGINX_LUA_HTTP_LUA_SOCKET_TCP_SEND_START(r, u, data, len)
+
+#define ngx_http_lua_probe_socket_tcp_receive_done(r, u, data, len)          \
+    NGINX_LUA_HTTP_LUA_SOCKET_TCP_RECEIVE_DONE(r, u, data, len)
+
+#define ngx_http_lua_probe_socket_tcp_setkeepalive_buf_unread(r, u, data, len)\
+    NGINX_LUA_HTTP_LUA_SOCKET_TCP_SETKEEPALIVE_BUF_UNREAD(r, u, data, len)
+
+#define ngx_http_lua_probe_user_thread_spawn(r, creator, newthread)          \
+    NGINX_LUA_HTTP_LUA_USER_THREAD_SPAWN(r, creator, newthread)
+
+#define ngx_http_lua_probe_thread_delete(r, thread, ctx)                     \
+    NGINX_LUA_HTTP_LUA_THREAD_DELETE(r, thread, ctx)
+
+#define ngx_http_lua_probe_run_posted_thread(r, thread, status)              \
+    NGINX_LUA_HTTP_LUA_RUN_POSTED_THREAD(r, thread, status)
+
+#define ngx_http_lua_probe_coroutine_done(r, co, success)                    \
+    NGINX_LUA_HTTP_LUA_COROUTINE_DONE(r, co, success)
+
+#define ngx_http_lua_probe_user_thread_wait(parent, child)                   \
+    NGINX_LUA_HTTP_LUA_USER_THREAD_WAIT(parent, child)
+
+#else /* !(NGX_DTRACE) */
+
+#define ngx_http_lua_probe_info(s)
+#define ngx_http_lua_probe_register_preload_package(L, pkg)
+#define ngx_http_lua_probe_req_socket_consume_preread(r, data, len)
+#define ngx_http_lua_probe_user_coroutine_create(r, parent, child)
+#define ngx_http_lua_probe_user_coroutine_resume(r, parent, child)
+#define ngx_http_lua_probe_user_coroutine_yield(r, parent, child)
+#define ngx_http_lua_probe_thread_yield(r, L)
+#define ngx_http_lua_probe_socket_tcp_send_start(r, u, data, len)
+#define ngx_http_lua_probe_socket_tcp_receive_done(r, u, data, len)
+#define ngx_http_lua_probe_socket_tcp_setkeepalive_buf_unread(r, u, data, len)
+#define ngx_http_lua_probe_user_thread_spawn(r, creator, newthread)
+#define ngx_http_lua_probe_thread_delete(r, thread, ctx)
+#define ngx_http_lua_probe_run_posted_thread(r, thread, status)
+#define ngx_http_lua_probe_coroutine_done(r, co, success)
+#define ngx_http_lua_probe_user_thread_wait(parent, child)
+
+#endif
+
+#endif /* NGX_HTTP_LUA_PROBE_H */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c b/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
index 46c6140..9135b96 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
@@ -9,6 +9,7 @@
 #include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_script.h"
 #include "ngx_http_lua_pcrefix.h"
+#include "ngx_http_lua_util.h"
 #include <pcre.h>
 
 
@@ -55,6 +56,7 @@ typedef struct {
 
 
 typedef struct {
+    ngx_http_cleanup_pt     *cleanup;
     ngx_http_request_t      *request;
     pcre                    *regex;
     pcre_extra              *regex_sd;
@@ -76,6 +78,8 @@ static int ngx_http_lua_ngx_re_gsub(lua_State *L);
 static void ngx_http_lua_regex_free_study_data(ngx_pool_t *pool,
     pcre_extra *sd);
 static ngx_int_t ngx_lua_regex_compile(ngx_lua_regex_compile_t *rc);
+static void ngx_http_lua_ngx_re_gmatch_cleanup(void *data);
+static int ngx_http_lua_ngx_re_gmatch_gc(lua_State *L);
 
 
 #define ngx_http_lua_regex_exec(re, e, s, start, captures, size) \
@@ -120,7 +124,8 @@ ngx_http_lua_ngx_re_match(lua_State *L)
                 "but got %d", nargs);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -174,7 +179,8 @@ ngx_http_lua_ngx_re_match(lua_State *L)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REGEX_CACHE); /* table */
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
         lua_pushvalue(L, 2); /* table regex */
@@ -273,7 +279,7 @@ ngx_http_lua_ngx_re_match(lua_State *L)
         return luaL_argerror(L, 2, msg);
     }
 
-#if LUA_HAVE_PCRE_JIT
+#if (LUA_HAVE_PCRE_JIT)
 
     if (flags & NGX_LUA_RE_MODE_JIT) {
 
@@ -304,7 +310,7 @@ ngx_http_lua_ngx_re_match(lua_State *L)
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                 "pcre JIT compiling result: %d", jitted);
         }
-#   endif /* NGX_DEBUG */
+#   endif /* !(NGX_DEBUG) */
 
     } else {
         old_pool = ngx_http_lua_pcre_malloc_init(pool);
@@ -318,18 +324,18 @@ ngx_http_lua_ngx_re_match(lua_State *L)
 
         if (msg != NULL) {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "pcre_study failed with PCRE_STUDY_JIT_COMPILE: %s (%p)",
-                msg, sd);
+                           "pcre_study failed with PCRE_STUDY_JIT_COMPILE: "
+                           "%s (%p)", msg, sd);
         }
 #   endif /* NGX_DEBUG */
     }
 
-#else  /* LUA_HAVE_PCRE_JIT */
+#else  /* !(LUA_HAVE_PCRE_JIT) */
 
     if (flags & NGX_LUA_RE_MODE_JIT) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "your pcre build does not have JIT support and "
-                "the \"j\" regex option is ignored");
+                       "your pcre build does not have JIT support and "
+                       "the \"j\" regex option is ignored");
     }
 
 #endif /* LUA_HAVE_PCRE_JIT */
@@ -514,6 +520,7 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
     ngx_pool_t                  *pool, *old_pool;
     u_char                       errstr[NGX_MAX_CONF_ERRSTR + 1];
     pcre_extra                  *sd = NULL;
+    ngx_http_cleanup_t          *cln;
 
     nargs = lua_gettop(L);
 
@@ -522,7 +529,8 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
                 nargs);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -554,7 +562,8 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REGEX_CACHE); /* table */
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
         lua_pushvalue(L, 2); /* table regex */
@@ -760,10 +769,9 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
     }
 
 compiled:
-    ctx = ngx_palloc(r->pool, sizeof(ngx_http_lua_regex_ctx_t));
-    if (ctx == NULL) {
-        return luaL_error(L, "out of memory");
-    }
+    lua_settop(L, 1);
+
+    ctx = lua_newuserdata(L, sizeof(ngx_http_lua_regex_ctx_t));
 
     ctx->request = r;
     ctx->regex = re_comp.regex;
@@ -773,11 +781,28 @@ compiled:
     ctx->captures_len = ovecsize;
     ctx->flags = (uint8_t) flags;
 
-    lua_settop(L, 1);
+    if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
+        lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
+        lua_pushcfunction(L, ngx_http_lua_ngx_re_gmatch_gc);
+        lua_setfield(L, -2, "__gc");
+        lua_setmetatable(L, -2);
+
+        cln = ngx_http_cleanup_add(r, 0);
+        if (cln == NULL) {
+            return luaL_error(L, "out of memory");
+        }
+
+        cln->handler = ngx_http_lua_ngx_re_gmatch_cleanup;
+        cln->data = ctx;
+        ctx->cleanup = &cln->handler;
+
+    } else {
+        ctx->cleanup = NULL;
+    }
+
+    lua_pushinteger(L, 0);
 
     /* upvalues in order: subj ctx offset */
-    lua_pushlightuserdata(L, ctx);
-    lua_pushinteger(L, 0);
     lua_pushcclosure(L, ngx_http_lua_ngx_re_gmatch_iterator, 3);
 
     return 1;
@@ -829,7 +854,8 @@ ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L)
 
     dd("offset %d, r %p, subj %s", (int) offset, ctx->request, subj.data);
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -873,13 +899,12 @@ ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L)
         if (!(ctx->flags & NGX_LUA_RE_COMPILE_ONCE)) {
             if (ctx->regex_sd) {
                 ngx_http_lua_regex_free_study_data(r->pool, ctx->regex_sd);
+                ctx->regex_sd = NULL;
             }
 
             ngx_pfree(r->pool, cap);
         }
 
-        ngx_pfree(r->pool, ctx);
-
         lua_pushnil(L);
         return 1;
     }
@@ -919,18 +944,21 @@ ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L)
     }
 
     offset = cap[1];
-    if (offset == (ssize_t) subj.len) {
+    if (offset == cap[0]) {
+        offset++;
+    }
+
+    if (offset > (ssize_t) subj.len) {
         offset = -1;
 
         if (!(ctx->flags & NGX_LUA_RE_COMPILE_ONCE)) {
             if (ctx->regex_sd) {
                 ngx_http_lua_regex_free_study_data(r->pool, ctx->regex_sd);
+                ctx->regex_sd = NULL;
             }
 
             ngx_pfree(r->pool, cap);
         }
-
-        ngx_pfree(r->pool, ctx);
     }
 
     lua_pushinteger(L, offset);
@@ -945,13 +973,12 @@ error:
     if (!(ctx->flags & NGX_LUA_RE_COMPILE_ONCE)) {
         if (ctx->regex_sd) {
             ngx_http_lua_regex_free_study_data(r->pool, ctx->regex_sd);
+            ctx->regex_sd = NULL;
         }
 
         ngx_pfree(r->pool, cap);
     }
 
-    ngx_pfree(r->pool, ctx);
-
     return luaL_error(L, msg);
 }
 
@@ -1060,6 +1087,7 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
     int                          type;
     unsigned                     func;
     int                          offset;
+    int                          cp_offset;
     size_t                       count;
     luaL_Buffer                  luabuf;
     ngx_int_t                    flags;
@@ -1077,7 +1105,8 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
                 nargs);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -1132,7 +1161,8 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REGEX_CACHE); /* table */
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "s");
         lua_pushinteger(L, tpl.len);
@@ -1360,13 +1390,18 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
         if (ngx_http_lua_compile_complex_value(&ccv) != NGX_OK) {
             ngx_pfree(pool, cap);
-            if (!func) {
-                ngx_pfree(pool, ctpl);
-                if ((flags & NGX_LUA_RE_COMPILE_ONCE) && tpl.len != 0) {
-                    ngx_pfree(pool, tpl.data);
-                }
+            ngx_pfree(pool, ctpl);
+
+            if ((flags & NGX_LUA_RE_COMPILE_ONCE) && tpl.len != 0) {
+                ngx_pfree(pool, tpl.data);
             }
 
+            if (sd) {
+                ngx_http_lua_regex_free_study_data(pool, sd);
+            }
+
+            ngx_pfree(pool, re_comp.regex);
+
             return luaL_error(L, "bad template for substitution: \"%s\"",
                     lua_tostring(L, 3));
         }
@@ -1405,12 +1440,9 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 exec:
     count = 0;
     offset = 0;
+    cp_offset = 0;
 
     for (;;) {
-        if (subj.len == 0) {
-            break;
-        }
-
         if (flags & NGX_LUA_RE_MODE_DFA) {
 
 #if LUA_HAVE_PCRE_DFA
@@ -1460,7 +1492,7 @@ exec:
         }
 
         if (func) {
-            lua_pushvalue(L, -1);
+            lua_pushvalue(L, 3);
 
             lua_createtable(L, rc - 1 /* narr */, 1 /* nrec */);
 
@@ -1497,14 +1529,23 @@ exec:
                     return luaL_argerror(L, 3, msg);
             }
 
-            luaL_addlstring(&luabuf, (char *) &subj.data[offset],
-                    cap[0] - offset);
+            lua_insert(L, 1);
+
+            luaL_addlstring(&luabuf, (char *) &subj.data[cp_offset],
+                    cap[0] - cp_offset);
 
             luaL_addlstring(&luabuf, (char *) tpl.data, tpl.len);
 
-            lua_pop(L, 1);
+            lua_remove(L, 1);
 
-            offset = cap[1];
+            cp_offset = cap[1];
+            offset = cp_offset;
+            if (offset == cap[0]) {
+                offset++;
+                if (offset > (ssize_t) subj.len) {
+                    break;
+                }
+            }
 
             if (global) {
                 continue;
@@ -1513,7 +1554,7 @@ exec:
             break;
         }
 
-        rc = ngx_http_lua_complex_value(r, &subj, offset, rc, cap, ctpl,
+        rc = ngx_http_lua_complex_value(r, &subj, cp_offset, rc, cap, ctpl,
                 &luabuf);
 
         if (rc != NGX_OK) {
@@ -1522,7 +1563,14 @@ exec:
             goto error;
         }
 
-        offset = cap[1];
+        cp_offset = cap[1];
+        offset = cp_offset;
+        if (offset == cap[0]) {
+            offset++;
+            if (offset > (ssize_t) subj.len) {
+                break;
+            }
+        }
 
         if (global) {
             continue;
@@ -1536,7 +1584,7 @@ exec:
         lua_settop(L, 1);
 
     } else {
-        if (offset != (int) subj.len) {
+        if (offset < (int) subj.len) {
             dd("adding trailer: %s (len %d)", &subj.data[offset],
                     (int) (subj.len - offset));
 
@@ -1668,11 +1716,13 @@ ngx_lua_regex_compile(ngx_lua_regex_compile_t *rc)
 
     rc->regex = re;
 
+#if 1
     n = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &rc->captures);
     if (n < 0) {
         p = "pcre_fullinfo(\"%V\", PCRE_INFO_CAPTURECOUNT) failed: %d";
         goto failed;
     }
+#endif
 
     return NGX_OK;
 
@@ -1683,5 +1733,45 @@ failed:
     return NGX_OK;
 }
 
+
+static void
+ngx_http_lua_ngx_re_gmatch_cleanup(void *data)
+{
+    ngx_http_lua_regex_ctx_t    *ctx = data;
+
+    if (ctx) {
+        if (ctx->regex_sd) {
+            ngx_http_lua_regex_free_study_data(ctx->request->pool,
+                                               ctx->regex_sd);
+            ctx->regex_sd = NULL;
+        }
+
+        if (ctx->cleanup) {
+            *ctx->cleanup = NULL;
+            ctx->cleanup = NULL;
+        }
+
+        ctx->request = NULL;
+    }
+
+    return;
+}
+
+
+static int
+ngx_http_lua_ngx_re_gmatch_gc(lua_State *L)
+{
+    ngx_http_lua_regex_ctx_t    *ctx;
+
+    ctx = lua_touserdata(L, 1);
+
+    if (ctx && ctx->cleanup) {
+        ngx_http_lua_ngx_re_gmatch_cleanup(ctx);
+    }
+
+    return 0;
+}
+
+
 #endif /* NGX_PCRE */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_body.c b/debian/modules/nginx-lua/src/ngx_http_lua_req_body.c
index fdb99b4..047545d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_req_body.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_req_body.c
@@ -17,6 +17,15 @@ static int ngx_http_lua_ngx_req_set_body_data(lua_State *L);
 static void ngx_http_lua_pool_cleanup_file(ngx_pool_t *p, ngx_fd_t fd);
 static int ngx_http_lua_ngx_req_set_body_file(lua_State *L);
 
+static int ngx_http_lua_ngx_req_init_body(lua_State *L);
+static int ngx_http_lua_ngx_req_append_body(lua_State *L);
+static int ngx_http_lua_ngx_req_body_finish(lua_State *L);
+static ngx_int_t ngx_http_lua_write_request_body(ngx_http_request_t *r,
+    ngx_chain_t *body);
+static ngx_int_t ngx_http_lua_read_body_resume(ngx_http_request_t *r);
+static void ngx_http_lua_req_body_cleanup(void *data);
+
+
 
 void
 ngx_http_lua_inject_req_body_api(lua_State *L)
@@ -38,6 +47,15 @@ ngx_http_lua_inject_req_body_api(lua_State *L)
 
     lua_pushcfunction(L, ngx_http_lua_ngx_req_set_body_file);
     lua_setfield(L, -2, "set_body_file");
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_init_body);
+    lua_setfield(L, -2, "init_body");
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_append_body);
+    lua_setfield(L, -2, "append_body");
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_body_finish);
+    lua_setfield(L, -2, "finish_body");
 }
 
 
@@ -46,8 +64,9 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
 {
     ngx_http_request_t          *r;
     int                          n;
-    ngx_http_lua_ctx_t          *ctx;
     ngx_int_t                    rc;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     n = lua_gettop(L);
 
@@ -55,10 +74,15 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
         return luaL_error(L, "expecting 0 arguments but seen %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
     r->request_body_in_single_buf = 1;
     r->request_body_in_persistent_file = 1;
     r->request_body_in_clean_file = 1;
@@ -71,7 +95,16 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
-        return luaL_error(L, "request context is null");
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    coctx = ctx->cur_co_ctx;
+    if (coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -79,6 +112,8 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
 
     rc = ngx_http_read_client_request_body(r, ngx_http_lua_req_body_post_read);
 
+    r->main->count--;
+
     if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
         return luaL_error(L, "failed to read request body");
     }
@@ -88,15 +123,16 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
                 "lua read buffered request body requires I/O interruptions");
 
         ctx->waiting_more_body = 1;
-        ctx->req_read_body_done = 0;
+        ctx->req_body_reader_co_ctx = coctx;
+
+        coctx->cleanup = ngx_http_lua_req_body_cleanup;
+        coctx->data = r;
 
         return lua_yield(L, 0);
     }
 
     /* rc == NGX_OK */
 
-    ctx->req_read_body_done = 0;
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
             "lua has read buffered request body in a single run");
 
@@ -107,25 +143,38 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
 static void
 ngx_http_lua_req_body_post_read(ngx_http_request_t *r)
 {
-    ngx_http_lua_ctx_t  *ctx;
+    ngx_http_lua_ctx_t      *ctx;
+    ngx_http_lua_co_ctx_t   *coctx;
+
+    ngx_http_lua_loc_conf_t             *llcf;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua req body post read");
+                   "lua req body post read");
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    ctx->req_read_body_done = 1;
-
-#if defined(nginx_version) && nginx_version >= 8011
-    r->main->count--;
-#endif
 
     if (ctx->waiting_more_body) {
         ctx->waiting_more_body = 0;
 
-        if (ctx->entered_content_phase) {
-            ngx_http_lua_wev_handler(r);
+        coctx = ctx->req_body_reader_co_ctx;
+        ctx->cur_co_ctx = coctx;
+
+        coctx->cleanup = NULL;
+
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->check_client_abort) {
+            r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
         } else {
+            r->read_event_handler = ngx_http_block_reading;
+        }
+
+        if (ctx->entered_content_phase) {
+            (void) ngx_http_lua_read_body_resume(r);
+
+        } else {
+            ctx->resume_handler = ngx_http_lua_read_body_resume;
             ngx_http_core_run_phases(r);
         }
     }
@@ -145,10 +194,15 @@ ngx_http_lua_ngx_req_discard_body(lua_State *L)
         return luaL_error(L, "expecting 0 arguments but seen %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
     rc = ngx_http_discard_request_body(r);
 
     if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
@@ -175,10 +229,15 @@ ngx_http_lua_ngx_req_get_body_data(lua_State *L)
         return luaL_error(L, "expecting 0 arguments but seen %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
     if (r->request_body == NULL
         || r->request_body->temp_file
         || r->request_body->bufs == NULL)
@@ -238,10 +297,15 @@ ngx_http_lua_ngx_req_get_body_file(lua_State *L)
         return luaL_error(L, "expecting 0 arguments but seen %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
     if (r->request_body == NULL || r->request_body->temp_file == NULL) {
         lua_pushnil(L);
         return 1;
@@ -286,10 +350,15 @@ ngx_http_lua_ngx_req_set_body_data(lua_State *L)
 
     body.data = (u_char *) luaL_checklstring(L, 1, &body.len);
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
     if (r->request_body == NULL) {
 
 #if 1
@@ -437,6 +506,269 @@ set_header:
 }
 
 
+static int
+ngx_http_lua_ngx_req_init_body(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    int                          n;
+    ngx_http_request_body_t     *rb;
+    ngx_int_t                    rc;
+    size_t                       size;
+    lua_Integer                  num;
+#if 1
+    ngx_temp_file_t             *tf;
+#endif
+    ngx_http_core_loc_conf_t    *clcf;
+
+    n = lua_gettop(L);
+
+    if (n != 1 && n != 0) {
+        return luaL_error(L, "expecting 0 or 1 argument but seen %d", n);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (n == 1) {
+        num = luaL_checkinteger(L, 1);
+        if (num <= 0) {
+            return luaL_error(L, "bad size argument: %d", (int) num);
+        }
+
+        size = (size_t) num;
+
+    } else {
+
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+        size = clcf->client_body_buffer_size;
+
+        size += size >> 2;
+
+        /* avoid allocating an unnecessary large buffer */
+        if (size > (size_t) r->headers_in.content_length_n) {
+            size = r->headers_in.content_length_n;
+        }
+    }
+
+    if (r->request_body == NULL) {
+
+#if 1
+        rc = ngx_http_discard_request_body(r);
+        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+            return luaL_error(L, "failed to discard request body");
+        }
+#endif
+
+        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
+        if (rb == NULL) {
+            return luaL_error(L, "out of memory");
+        }
+
+        r->request_body = rb;
+
+    } else {
+        rb = r->request_body;
+    }
+
+#if 1
+    tf = rb->temp_file;
+
+    if (tf) {
+        if (tf->file.fd != NGX_INVALID_FILE) {
+
+            dd("cleaning temp file %.*s", (int) tf->file.name.len,
+                    tf->file.name.data);
+
+            ngx_http_lua_pool_cleanup_file(r->pool, tf->file.fd);
+
+            ngx_memzero(tf, sizeof(ngx_temp_file_t));
+
+            tf->file.fd = NGX_INVALID_FILE;
+
+            dd("temp file cleaned: %.*s", (int) tf->file.name.len,
+                    tf->file.name.data);
+        }
+
+        rb->temp_file = NULL;
+    }
+#endif
+
+    r->request_body_in_clean_file = 1;
+
+    r->headers_in.content_length_n = 0;
+
+    rb->buf = ngx_create_temp_buf(r->pool, size);
+    if (rb->buf == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    rb->bufs = ngx_alloc_chain_link(r->pool);
+    if (rb->bufs == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    rb->bufs->buf = rb->buf;
+    rb->bufs->next = NULL;
+
+    return 0;
+}
+
+
+static int
+ngx_http_lua_ngx_req_append_body(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    int                          n;
+    ngx_http_request_body_t     *rb;
+    ngx_str_t                   body;
+    size_t                      size, rest;
+    size_t                      offset = 0;
+
+    n = lua_gettop(L);
+
+    if (n != 1) {
+        return luaL_error(L, "expecting 1 arguments but seen %d", n);
+    }
+
+    body.data = (u_char *) luaL_checklstring(L, 1, &body.len);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r->request_body == NULL
+        || r->request_body->buf == NULL
+        || r->request_body->bufs == NULL)
+    {
+        return luaL_error(L, "request_body not initalized");
+    }
+
+    rb = r->request_body;
+
+    rest = body.len;
+
+    while (rest > 0) {
+        if (rb->buf->last == rb->buf->end) {
+            if (ngx_http_lua_write_request_body(r, rb->bufs) != NGX_OK) {
+                return luaL_error(L, "fail to write file");
+            }
+
+            rb->buf->last = rb->buf->start;
+        }
+
+        size = rb->buf->end - rb->buf->last;
+
+        if (size > rest) {
+            size = rest;
+        }
+
+        ngx_memcpy(rb->buf->last, body.data + offset, size);
+
+        rb->buf->last += size;
+        rest -= size;
+        offset += size;
+        r->headers_in.content_length_n += size;
+    }
+
+    return 0;
+}
+
+
+static int
+ngx_http_lua_ngx_req_body_finish(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    int                          n;
+    ngx_http_request_body_t     *rb;
+    ngx_buf_t                   *b;
+    size_t                      size;
+    ngx_str_t                   value;
+    ngx_str_t                   key;
+    ngx_int_t                   rc;
+
+    n = lua_gettop(L);
+
+    if (n != 0) {
+        return luaL_error(L, "expecting 0 argument but seen %d", n);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r->request_body == NULL || r->request_body->buf == NULL
+        || r->request_body->bufs == NULL) {
+
+        return luaL_error(L, "request_body not initalized");
+    }
+
+    rb = r->request_body;
+
+    if (rb->temp_file) {
+
+        /* save the last part */
+
+        if (ngx_http_lua_write_request_body(r, rb->bufs) != NGX_OK) {
+            return luaL_error(L, "fail to write file");
+        }
+
+        b = ngx_calloc_buf(r->pool);
+        if (b == NULL) {
+            return luaL_error(L, "out of memory");
+        }
+
+        b->in_file = 1;
+        b->file_pos = 0;
+        b->file_last = rb->temp_file->file.offset;
+        b->file = &rb->temp_file->file;
+
+        if (rb->bufs->next) {
+            rb->bufs->next->buf = b;
+
+        } else {
+            rb->bufs->buf = b;
+        }
+    }
+
+    /* override input header Content-Length (value must be null terminated) */
+
+    value.data = ngx_palloc(r->pool, NGX_SIZE_T_LEN + 1);
+    if (value.data == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    size = r->headers_in.content_length_n;
+
+    value.len = ngx_sprintf(value.data, "%uz", size) - value.data;
+    value.data[value.len] = '\0';
+
+    dd("setting request Content-Length to %.*s (%d)", (int) value.len,
+       value.data, (int) size);
+
+    if (r->headers_in.content_length) {
+        r->headers_in.content_length->value.data = value.data;
+        r->headers_in.content_length->value.len = value.len;
+
+    } else {
+
+        ngx_str_set(&key, "Content-Length");
+
+        rc = ngx_http_lua_set_input_header(r, key, value, 1 /* override */);
+        if (rc != NGX_OK) {
+            return luaL_error(L, "failed to reset the Content-Length "
+                    "input header");
+        }
+    }
+
+    return 0;
+
+}
+
+
 static void
 ngx_http_lua_pool_cleanup_file(ngx_pool_t *p, ngx_fd_t fd)
 {
@@ -463,6 +795,7 @@ ngx_http_lua_pool_cleanup_file(ngx_pool_t *p, ngx_fd_t fd)
 static int
 ngx_http_lua_ngx_req_set_body_file(lua_State *L)
 {
+    u_char                      *p;
     ngx_http_request_t          *r;
     int                          n;
     ngx_http_request_body_t     *rb;
@@ -485,7 +818,24 @@ ngx_http_lua_ngx_req_set_body_file(lua_State *L)
         return luaL_error(L, "expecting 1 or 2 arguments but seen %d", n);
     }
 
-    name.data = (u_char *) luaL_checklstring(L, 1, &name.len);
+    p = (u_char *) luaL_checklstring(L, 1, &name.len);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
+    name.data = ngx_palloc(r->pool, name.len + 1);
+    if (name.data == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    ngx_memcpy(name.data, p, name.len);
+    name.data[name.len] = '\0';
 
     if (n == 2) {
         luaL_checktype(L, 2, LUA_TBOOLEAN);
@@ -497,10 +847,6 @@ ngx_http_lua_ngx_req_set_body_file(lua_State *L)
 
     dd("clean: %d", (int) clean);
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
     if (r->request_body == NULL) {
 
 #if 1
@@ -704,3 +1050,116 @@ set_header:
     return 0;
 }
 
+
+static ngx_int_t
+ngx_http_lua_write_request_body(ngx_http_request_t *r, ngx_chain_t *body)
+{
+    ssize_t                    n;
+    ngx_temp_file_t           *tf;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    rb = r->request_body;
+
+    if (rb->temp_file == NULL) {
+        tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
+        if (tf == NULL) {
+            return NGX_ERROR;
+        }
+
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+        tf->file.fd = NGX_INVALID_FILE;
+        tf->file.log = r->connection->log;
+        tf->path = clcf->client_body_temp_path;
+        tf->pool = r->pool;
+        tf->warn = "a client request body is buffered to a temporary file";
+        tf->log_level = r->request_body_file_log_level;
+        tf->persistent = 1;
+        tf->clean = 1;
+
+        if (r->request_body_file_group_access) {
+            tf->access = 0660;
+        }
+
+        rb->temp_file = tf;
+    }
+
+    n = ngx_write_chain_to_temp_file(rb->temp_file, body);
+
+    /* TODO: n == 0 or not complete and level event */
+
+    if (n == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    rb->temp_file->offset += n;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_read_body_resume(ngx_http_request_t *r)
+{
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    c = r->connection;
+
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_req_body_cleanup(void *data)
+{
+    ngx_http_request_t                  *r;
+    ngx_http_lua_ctx_t                  *ctx;
+    ngx_http_lua_co_ctx_t               *coctx = data;
+
+    r = coctx->data;
+    if (r == NULL) {
+        return;
+    }
+
+    if (r->connection->read->timer_set) {
+        ngx_del_timer(r->connection->read);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    ctx->waiting_more_body = 0;
+    r->keepalive = 0;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_method.c b/debian/modules/nginx-lua/src/ngx_http_lua_req_method.c
new file mode 100644
index 0000000..d047947
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_req_method.c
@@ -0,0 +1,108 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+
+#include "ddebug.h"
+#include "ngx_http_lua_req_method.h"
+#include "ngx_http_lua_subrequest.h"
+#include "ngx_http_lua_util.h"
+
+
+static int ngx_http_lua_ngx_req_get_method(lua_State *L);
+static int ngx_http_lua_ngx_req_set_method(lua_State *L);
+
+
+void
+ngx_http_lua_inject_req_method_api(lua_State *L)
+{
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_method);
+    lua_setfield(L, -2, "get_method");
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_set_method);
+    lua_setfield(L, -2, "set_method");
+}
+
+
+static int
+ngx_http_lua_ngx_req_get_method(lua_State *L)
+{
+    int                      n;
+    ngx_http_request_t      *r;
+
+    n = lua_gettop(L);
+    if (n != 0) {
+        return luaL_error(L, "only one argument expected but got %d", n);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
+    lua_pushlstring(L, (char *) r->method_name.data, r->method_name.len);
+    return 1;
+}
+
+
+static int
+ngx_http_lua_ngx_req_set_method(lua_State *L)
+{
+    int                  n;
+    int                  method;
+    ngx_http_request_t  *r;
+
+    n = lua_gettop(L);
+    if (n != 1) {
+        return luaL_error(L, "only one argument expected but got %d", n);
+    }
+
+    method = luaL_checkint(L, 1);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
+    r->method = method;
+
+    switch (method) {
+        case NGX_HTTP_GET:
+            r->method_name = ngx_http_lua_get_method;
+            break;
+
+        case NGX_HTTP_POST:
+            r->method_name = ngx_http_lua_post_method;
+            break;
+
+        case NGX_HTTP_PUT:
+            r->method_name = ngx_http_lua_put_method;
+            break;
+
+        case NGX_HTTP_HEAD:
+            r->method_name = ngx_http_lua_head_method;
+            break;
+
+        case NGX_HTTP_DELETE:
+            r->method_name = ngx_http_lua_delete_method;
+            break;
+
+        case NGX_HTTP_OPTIONS:
+            r->method_name = ngx_http_lua_options_method;
+            break;
+
+        default:
+            return luaL_error(L, "unsupported HTTP method: %d", method);
+
+    }
+
+    return 0;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_method.h b/debian/modules/nginx-lua/src/ngx_http_lua_req_method.h
new file mode 100644
index 0000000..cf8d5c4
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_req_method.h
@@ -0,0 +1,12 @@
+#ifndef NGX_HTTP_LUA_METHOD_H
+#define NGX_HTTP_LUA_METHOD_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_req_method_api(lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_METHOD_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
index ecf7ea8..82750a2 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
@@ -30,7 +30,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua rewrite handler, uri \"%V\"", &r->uri);
+                   "lua rewrite handler, uri \"%V\"", &r->uri);
 
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
@@ -83,28 +83,17 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
     dd("ctx = %p", ctx);
 
     if (ctx == NULL) {
-        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+        ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
-
-        dd("setting new ctx: ctx = %p", ctx);
-
-        ctx->cc_ref = LUA_NOREF;
-        ctx->ctx_ref = LUA_NOREF;
-
-        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
     }
 
     dd("entered? %d", (int) ctx->entered_rewrite_phase);
 
-    if (ctx->waiting_more_body) {
-        return NGX_DONE;
-    }
-
     if (ctx->entered_rewrite_phase) {
         dd("rewriteby: calling wev handler");
-        rc = ngx_http_lua_wev_handler(r);
+        rc = ctx->resume_handler(r);
         dd("rewriteby: wev handler returns %d", (int) rc);
 
         if (rc == NGX_OK) {
@@ -114,12 +103,16 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
         return rc;
     }
 
+    if (ctx->waiting_more_body) {
+        return NGX_DONE;
+    }
+
     if (llcf->force_read_body && !ctx->read_body_done) {
         r->request_body_in_single_buf = 1;
         r->request_body_in_persistent_file = 1;
         r->request_body_in_clean_file = 1;
 
-        rc = ngx_http_read_client_request_body(r, 
+        rc = ngx_http_read_client_request_body(r,
                 ngx_http_lua_generic_phase_post_read);
 
         if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
@@ -164,7 +157,7 @@ ngx_http_lua_rewrite_handler_inline(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua inlined code: %s", err);
+                      "failed to load Lua inlined code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -210,7 +203,7 @@ ngx_http_lua_rewrite_handler_file(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "Failed to load Lua file code: %s", err);
+                      "failed to load Lua file code: %s", err);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -222,36 +215,36 @@ ngx_http_lua_rewrite_handler_file(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
 {
-    int                      cc_ref;
-    lua_State               *cc;
+    int                      co_ref;
+    lua_State               *co;
+    ngx_int_t                rc;
+    ngx_connection_t        *c;
     ngx_http_lua_ctx_t      *ctx;
     ngx_http_cleanup_t      *cln;
-    ngx_int_t                rc;
+
+    ngx_http_lua_loc_conf_t     *llcf;
 
     /*  {{{ new coroutine to handle request */
-    cc = ngx_http_lua_new_thread(r, L, &cc_ref);
+    co = ngx_http_lua_new_thread(r, L, &co_ref);
 
-    if (cc == NULL) {
+    if (co == NULL) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                "lua: failed to create new coroutine to handle request");
+                      "lua: failed to create new coroutine to handle request");
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
     /*  move code closure to new coroutine */
-    lua_xmove(L, cc, 1);
+    lua_xmove(L, co, 1);
 
     /*  set closure's env table to new coroutine's globals table */
-    lua_pushvalue(cc, LUA_GLOBALSINDEX);
-    lua_setfenv(cc, -2);
-
-    /*  save reference of code to ease forcing stopping */
-    lua_pushvalue(cc, -1);
-    lua_setglobal(cc, GLOBALS_SYMBOL_RUNCODE);
+    lua_pushvalue(co, LUA_GLOBALSINDEX);
+    lua_setfenv(co, -2);
 
     /*  save nginx request in coroutine globals table */
-    lua_pushlightuserdata(cc, r);
-    lua_setglobal(cc, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(co, &ngx_http_lua_request_key);
+    lua_pushlightuserdata(co, r);
+    lua_rawset(co, LUA_GLOBALSINDEX);
     /*  }}} */
 
     /*  {{{ initialize request context */
@@ -267,8 +260,9 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     ctx->entered_rewrite_phase = 1;
 
-    ctx->cc = cc;
-    ctx->cc_ref = cc_ref;
+    ctx->cur_co_ctx = &ctx->entry_co_ctx;
+    ctx->cur_co_ctx->co = co;
+    ctx->cur_co_ctx->co_ref = co_ref;
 
     /*  }}} */
 
@@ -285,22 +279,43 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     }
     /*  }}} */
 
+    ctx->context = NGX_HTTP_LUA_CONTEXT_REWRITE;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    if (llcf->check_client_abort) {
+        r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
+
+    } else {
+        r->read_event_handler = ngx_http_block_reading;
+    }
+
     rc = ngx_http_lua_run_thread(L, r, ctx, 0);
 
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+    if (rc == NGX_ERROR || rc > NGX_OK) {
         return rc;
     }
 
+    c = r->connection;
+
     if (rc == NGX_AGAIN) {
-        return NGX_DONE;
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+
+        if (rc == NGX_OK) {
+            return NGX_DECLINED;
+        }
+
+        return rc;
     }
 
     if (rc == NGX_DONE) {
         ngx_http_finalize_request(r, NGX_DONE);
-        return NGX_DONE;
-    }
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+
+        if (rc == NGX_OK) {
+            return NGX_DECLINED;
+        }
 
-    if (rc >= NGX_HTTP_OK && rc < NGX_HTTP_SPECIAL_RESPONSE) {
         return rc;
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_script.c b/debian/modules/nginx-lua/src/ngx_http_lua_script.c
index 25fef1e..cc96794 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_script.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_script.c
@@ -84,6 +84,8 @@ ngx_http_lua_compile_complex_value(ngx_http_lua_compile_complex_value_t *ccv)
     sc.complete_values = 1;
 
     if (ngx_http_lua_script_compile(&sc) != NGX_OK) {
+        ngx_array_destroy(&lengths);
+        ngx_array_destroy(&values);
         return NGX_ERROR;
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_setby.c b/debian/modules/nginx-lua/src/ngx_http_lua_setby.c
index 38e4bdb..08748b0 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_setby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_setby.c
@@ -12,21 +12,23 @@
 #include "ngx_http_lua_time.h"
 #include "ngx_http_lua_log.h"
 #include "ngx_http_lua_regex.h"
-#include "ngx_http_lua_ndk.h"
 #include "ngx_http_lua_variable.h"
 #include "ngx_http_lua_string.h"
 #include "ngx_http_lua_misc.h"
 #include "ngx_http_lua_consts.h"
 #include "ngx_http_lua_shdict.h"
+#include "ngx_http_lua_util.h"
 
 
-static void ngx_http_lua_inject_arg_api(lua_State *L,
-       size_t nargs,  ngx_http_variable_value_t *args);
-static int ngx_http_lua_param_get(lua_State *L);
 static void ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r,
         size_t nargs, ngx_http_variable_value_t *args);
 
 
+/* chars whose addresses are used as keys in Lua VM regsitry */
+static char ngx_http_lua_setby_nargs_key;
+static char ngx_http_lua_setby_args_key;
+
+
 ngx_int_t
 ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
         ngx_http_variable_value_t *args, size_t nargs, ngx_str_t *script)
@@ -34,8 +36,8 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
     size_t           i;
     ngx_int_t        rc;
     u_char          *err_msg;
-    size_t           rlen;
-    u_char          *rdata;
+    size_t           len;
+    u_char          *data;
 #if (NGX_PCRE)
     ngx_pool_t      *old_pool;
 #endif
@@ -48,18 +50,11 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
     if (ctx == NULL) {
-        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+        ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
             return NGX_ERROR;
         }
 
-        dd("setting new ctx: ctx = %p", ctx);
-
-        ctx->cc_ref = LUA_NOREF;
-        ctx->ctx_ref = LUA_NOREF;
-
-        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
-
     } else {
         ngx_http_lua_reset_ctx(r, L, ctx);
     }
@@ -75,55 +70,70 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
         ctx->cleanup = &cln->handler;
     }
 
-    /*  set Lua VM panic handler */
+    ctx->context = NGX_HTTP_LUA_CONTEXT_SET;
+
+    dd("set Lua VM panic handler");
+
     lua_atpanic(L, ngx_http_lua_atpanic);
 
-    /*  initialize nginx context in Lua VM, code chunk at stack top    sp = 1 */
-    ngx_http_lua_set_by_lua_env(L, r, nargs, args);
+    NGX_LUA_EXCEPTION_TRY {
+        dd("initialize nginx context in Lua VM, code chunk at "
+           "stack top    sp = 1");
+        ngx_http_lua_set_by_lua_env(L, r, nargs, args);
 
-    /*  passing directive arguments to the user code */
-    for (i = 0; i < nargs; i++) {
-        lua_pushlstring(L, (const char *) args[i].data, args[i].len);
-    }
-
-#if (NGX_PCRE)
-    /* XXX: work-around to nginx regex subsystem */
-    old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
-#endif
-
-    /*  protected call user code */
-    rc = lua_pcall(L, nargs, 1, 0);
-
-#if (NGX_PCRE)
-    /* XXX: work-around to nginx regex subsystem */
-    ngx_http_lua_pcre_malloc_done(old_pool);
-#endif
-
-    if (rc != 0) {
-        /*  error occured when running loaded code */
-        err_msg = (u_char *) lua_tostring(L, -1);
-
-        if (err_msg != NULL) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "(lua-error) %s",
-                    err_msg);
-
-            lua_settop(L, 0);    /*  clear remaining elems on stack */
+        /*  passing directive arguments to the user code */
+        for (i = 0; i < nargs; i++) {
+            lua_pushlstring(L, (const char *) args[i].data, args[i].len);
         }
 
-        return NGX_ERROR;
-    }
+#if (NGX_PCRE)
+        /* XXX: work-around to nginx regex subsystem */
+        old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
+#endif
 
-    NGX_LUA_EXCEPTION_TRY {
-        rdata = (u_char *) lua_tolstring(L, -1, &rlen);
+        lua_pushcfunction(L, ngx_http_lua_traceback);
+        lua_insert(L, 1);  /* put it under chunk and args */
 
-        if (rdata) {
-            val->data = ngx_pcalloc(r->pool, rlen);
+        dd("protected call user code");
+
+        rc = lua_pcall(L, nargs, 1, 1);
+
+        dd("after protected call user code");
+
+        lua_remove(L, 1);  /* remove traceback function */
+
+#if (NGX_PCRE)
+        /* XXX: work-around to nginx regex subsystem */
+        ngx_http_lua_pcre_malloc_done(old_pool);
+#endif
+
+        if (rc != 0) {
+            /*  error occured when running loaded code */
+            err_msg = (u_char *) lua_tolstring(L, -1, &len);
+
+            if (err_msg == NULL) {
+                err_msg = (u_char *) "unknown reason";
+                len = sizeof("unknown reason") - 1;
+            }
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "failed to run set_by_lua*: %*s", len, err_msg);
+
+            lua_settop(L, 0);    /*  clear remaining elems on stack */
+
+            return NGX_ERROR;
+        }
+
+        data = (u_char *) lua_tolstring(L, -1, &len);
+
+        if (data) {
+            val->data = ngx_palloc(r->pool, len);
             if (val->data == NULL) {
                 return NGX_ERROR;
             }
 
-            ngx_memcpy(val->data, rdata, rlen);
-            val->len = rlen;
+            ngx_memcpy(val->data, data, len);
+            val->len = len;
 
         } else {
             val->data = NULL;
@@ -131,7 +141,9 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
         }
 
     } NGX_LUA_EXCEPTION_CATCH {
+
         dd("nginx execution restored");
+        return NGX_ERROR;
     }
 
     /*  clear Lua stack */
@@ -141,28 +153,8 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 }
 
 
-static void
-ngx_http_lua_inject_arg_api(lua_State *L, size_t nargs,
-        ngx_http_variable_value_t *args)
-{
-    lua_newtable(L);    /*  .arg table aka {} */
-
-    lua_newtable(L);    /*  the metatable for new param table */
-    lua_pushinteger(L, nargs);    /*  1st upvalue: argument number */
-    lua_pushlightuserdata(L, args);    /*  2nd upvalue: pointer to arguments */
-
-    lua_pushcclosure(L, ngx_http_lua_param_get, 2);
-        /*  binding upvalues to __index meta-method closure */
-
-    lua_setfield(L, -2, "__index");
-    lua_setmetatable(L, -2);    /*  tie the metatable to param table */
-
-    lua_setfield(L, -2, "arg");    /*  set ngx.arg table */
-}
-
-
-static int
-ngx_http_lua_param_get(lua_State *L)
+int
+ngx_http_lua_setby_param_get(lua_State *L)
 {
     int         idx;
     int         n;
@@ -172,11 +164,15 @@ ngx_http_lua_param_get(lua_State *L)
     idx = luaL_checkint(L, 2);
     idx--;
 
-    /*  get number of args from closure */
-    n = luaL_checkint(L, lua_upvalueindex(1));
+    /*  get number of args from globals */
+    lua_pushlightuserdata(L, &ngx_http_lua_setby_nargs_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    n = (int) lua_tointeger(L, -1);
 
-    /*  get args from closure */
-    v = lua_touserdata(L, lua_upvalueindex(2));
+    /*  get args from globals */
+    lua_pushlightuserdata(L, &ngx_http_lua_setby_args_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    v = lua_touserdata(L, -1);
 
     if (idx < 0 || idx > n - 1) {
         lua_pushnil(L);
@@ -204,18 +200,25 @@ static void
 ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r, size_t nargs,
         ngx_http_variable_value_t *args)
 {
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
     /*  set nginx request pointer to current lua thread's globals table */
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
     lua_pushlightuserdata(L, r);
-    lua_setglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_rawset(L, LUA_GLOBALSINDEX);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_setby_nargs_key);
+    lua_pushinteger(L, nargs);
+    lua_rawset(L, LUA_GLOBALSINDEX);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_setby_args_key);
+    lua_pushlightuserdata(L, args);
+    lua_rawset(L, LUA_GLOBALSINDEX);
 
     /**
      * we want to create empty environment for current script
      *
-     * setmetatable({}, {__index = _G})
+     * newt = {}
+     * newt["_G"] = newt
+     * setmetatable(newt, {__index = _G})
      *
      * if a function or symbol is not defined in our env, __index will lookup
      * in the global env.
@@ -223,43 +226,14 @@ ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r, size_t nargs,
      * all variables created in the script-env will be thrown away at the end
      * of the script run.
      * */
-    lua_newtable(L);    /*  new empty environment aka {} */
-
-#if defined(NDK) && NDK
-    ngx_http_lua_inject_ndk_api(L);
-#endif /* defined(NDK) && NDK */
-
-    /*  {{{ initialize ngx.* namespace */
-
-    lua_createtable(L, 0 /* narr */, 72 /* nrec */);    /*  ngx.* */
-
-    ngx_http_lua_inject_internal_utils(r->connection->log, L);
-
-    ngx_http_lua_inject_core_consts(L);
-    ngx_http_lua_inject_http_consts(L);
-
-    ngx_http_lua_inject_log_api(L);
-    ngx_http_lua_inject_http_consts(L);
-    ngx_http_lua_inject_core_consts(L);
-    ngx_http_lua_inject_time_api(L);
-    ngx_http_lua_inject_string_api(L);
-    ngx_http_lua_inject_variable_api(L);
-    ngx_http_lua_inject_req_api_no_io(r->connection->log, L);
-    ngx_http_lua_inject_arg_api(L, nargs, args);
-#if (NGX_PCRE)
-    ngx_http_lua_inject_regex_api(L);
-#endif
-    ngx_http_lua_inject_shdict_api(lmcf, L);
-    ngx_http_lua_inject_misc_api(L);
-
-    lua_setfield(L, -2, "ngx");
-    /*  }}} */
+    ngx_http_lua_create_new_global_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
-    lua_newtable(L);    /*  the metatable for the new env */
+    /* the metatable for the new env */
+    lua_createtable(L, 0 /* narr */, 1 /* nrec */);
     lua_pushvalue(L, LUA_GLOBALSINDEX);
     lua_setfield(L, -2, "__index");
-    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
+    lua_setmetatable(L, -2);    /*  setmetatable(newt, {__index = _G}) */
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_setby.h b/debian/modules/nginx-lua/src/ngx_http_lua_setby.h
index 8537700..c2017bf 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_setby.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_setby.h
@@ -9,6 +9,8 @@ ngx_int_t ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r,
         ngx_str_t *val, ngx_http_variable_value_t *args, size_t nargs,
         ngx_str_t *script);
 
+int ngx_http_lua_setby_param_get(lua_State *L);
+
 
 #endif /* NGX_HTTP_LUA_SET_BY_H */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
index 3a7de98..a61334b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
@@ -5,6 +5,8 @@
 
 
 #include "ngx_http_lua_shdict.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_api.h"
 
 
 static int ngx_http_lua_shdict_set(lua_State *L);
@@ -20,6 +22,8 @@ static int ngx_http_lua_shdict_replace(lua_State *L);
 static int ngx_http_lua_shdict_incr(lua_State *L);
 static int ngx_http_lua_shdict_delete(lua_State *L);
 static int ngx_http_lua_shdict_flush_all(lua_State *L);
+static int ngx_http_lua_shdict_flush_expired(lua_State *L);
+static int ngx_http_lua_shdict_get_keys(lua_State *L);
 
 
 #define NGX_HTTP_LUA_SHDICT_ADD         0x0001
@@ -33,6 +37,9 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 
     size_t                      len;
     ngx_http_lua_shdict_ctx_t  *ctx;
+    ngx_http_lua_main_conf_t   *lmcf;
+
+    dd("init zone");
 
     ctx = shm_zone->data;
 
@@ -40,7 +47,7 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
         ctx->sh = octx->sh;
         ctx->shpool = octx->shpool;
 
-        return NGX_OK;
+        goto done;
     }
 
     ctx->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
@@ -48,7 +55,7 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     if (shm_zone->shm.exists) {
         ctx->sh = ctx->shpool->data;
 
-        return NGX_OK;
+        goto done;
     }
 
     ctx->sh = ngx_slab_alloc(ctx->shpool, sizeof(ngx_http_lua_shdict_shctx_t));
@@ -73,6 +80,24 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_sprintf(ctx->shpool->log_ctx, " in lua_shared_dict zone \"%V\"%Z",
                 &shm_zone->shm.name);
 
+done:
+    dd("get lmcf");
+
+    lmcf = ctx->main_conf;
+
+    dd("lmcf->lua: %p", lmcf->lua);
+
+    lmcf->shm_zones_inited++;
+
+    if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
+        && lmcf->init_handler)
+    {
+        if (lmcf->init_handler(ctx->log, lmcf, lmcf->lua) != 0) {
+            /* an error happened */
+            return NGX_ERROR;
+        }
+    }
+
     return NGX_OK;
 }
 
@@ -257,7 +282,7 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
         lua_createtable(L, 0, lmcf->shm_zones->nelts /* nrec */);
                 /* ngx.shared */
 
-        lua_createtable(L, 0 /* narr */, 8 /* nrec */); /* shared mt */
+        lua_createtable(L, 0 /* narr */, 10 /* nrec */); /* shared mt */
 
         lua_pushcfunction(L, ngx_http_lua_shdict_get);
         lua_setfield(L, -2, "get");
@@ -280,6 +305,12 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
         lua_pushcfunction(L, ngx_http_lua_shdict_flush_all);
         lua_setfield(L, -2, "flush_all");
 
+        lua_pushcfunction(L, ngx_http_lua_shdict_flush_expired);
+        lua_setfield(L, -2, "flush_expired");
+
+        lua_pushcfunction(L, ngx_http_lua_shdict_get_keys);
+        lua_setfield(L, -2, "get_keys");
+
         lua_pushvalue(L, -1); /* shared mt mt */
         lua_setfield(L, -2, "__index"); /* shared mt */
 
@@ -310,9 +341,6 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
 static int
 ngx_http_lua_shdict_get(lua_State *L)
 {
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-#endif
     int                          n;
     ngx_str_t                    name;
     ngx_str_t                    key;
@@ -361,11 +389,7 @@ ngx_http_lua_shdict_get(lua_State *L)
     hash = ngx_crc32_short(key.data, key.len);
 
 #if (NGX_DEBUG)
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
                    "fetching key \"%V\" in shared dict \"%V\"", &key, &name);
 #endif /* NGX_DEBUG */
 
@@ -375,8 +399,7 @@ ngx_http_lua_shdict_get(lua_State *L)
     ngx_http_lua_shdict_expire(ctx, 1);
 #endif
 
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len,
-            &sd);
+    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
 
     dd("shdict lookup returns %d", (int) rc);
 
@@ -517,6 +540,184 @@ ngx_http_lua_shdict_flush_all(lua_State *L)
 }
 
 
+static int
+ngx_http_lua_shdict_flush_expired(lua_State *L)
+{
+    ngx_queue_t                 *q, *prev;
+    ngx_http_lua_shdict_node_t  *sd;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_shm_zone_t              *zone;
+    ngx_time_t                  *tp;
+    int                          freed = 0;
+    int                          attempts = 0;
+    ngx_rbtree_node_t           *node;
+    uint64_t                     now;
+    int                          n;
+
+    n = lua_gettop(L);
+
+    if (n != 1 && n != 2) {
+        return luaL_error(L, "expecting 1 or 2 argument(s), "
+                "but saw %d", n);
+    }
+
+    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+
+    zone = lua_touserdata(L, 1);
+    if (zone == NULL) {
+        return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
+    }
+
+    if (n == 2) {
+        attempts = luaL_checknumber(L, 2);
+    }
+
+    ctx = zone->data;
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+    if (ngx_queue_empty(&ctx->sh->queue)) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+        lua_pushnumber(L, 0);
+        return 1;
+    }
+
+    tp = ngx_timeofday();
+
+    now = (uint64_t) tp->sec * 1000 + tp->msec;
+
+    q = ngx_queue_last(&ctx->sh->queue);
+
+    while (q != ngx_queue_sentinel(&ctx->sh->queue)) {
+        prev = ngx_queue_prev(q);
+
+        sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
+
+        if (sd->expires != 0 && sd->expires <= now) {
+            ngx_queue_remove(q);
+
+            node = (ngx_rbtree_node_t *)
+                ((u_char *) sd - offsetof(ngx_rbtree_node_t, color));
+
+            ngx_rbtree_delete(&ctx->sh->rbtree, node);
+
+            ngx_slab_free_locked(ctx->shpool, node);
+
+            freed++;
+
+            if (attempts && freed == attempts) {
+                break;
+            }
+        }
+
+        q = prev;
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    lua_pushnumber(L, freed);
+    return 1;
+}
+
+
+/*
+ * This trades CPU for memory. This is potentially slow. O(2n)
+ */
+
+static int
+ngx_http_lua_shdict_get_keys(lua_State *L)
+{
+    ngx_queue_t                 *q, *prev;
+    ngx_http_lua_shdict_node_t  *sd;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_shm_zone_t              *zone;
+    ngx_time_t                  *tp;
+    int                          total = 0;
+    int                          attempts = 1024;
+    uint64_t                     now;
+    int                          n;
+
+    n = lua_gettop(L);
+
+    if (n != 1 && n != 2) {
+        return luaL_error(L, "expecting 1 or 2 argument(s), "
+                          "but saw %d", n);
+    }
+
+    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+
+    zone = lua_touserdata(L, 1);
+    if (zone == NULL) {
+        return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
+    }
+
+    if (n == 2) {
+        attempts = luaL_checknumber(L, 2);
+    }
+
+    ctx = zone->data;
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+    if (ngx_queue_empty(&ctx->sh->queue)) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+        lua_createtable(L, 0, 0);
+        return 1;
+    }
+
+    tp = ngx_timeofday();
+
+    now = (uint64_t) tp->sec * 1000 + tp->msec;
+
+    /* first run through: get total number of elements we need to allocate */
+
+    q = ngx_queue_last(&ctx->sh->queue);
+
+    while (q != ngx_queue_sentinel(&ctx->sh->queue)) {
+        prev = ngx_queue_prev(q);
+
+        sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
+
+        if (sd->expires == 0 || sd->expires > now) {
+            total++;
+            if (attempts && total == attempts) {
+                break;
+            }
+        }
+
+        q = prev;
+    }
+
+    lua_createtable(L, total, 0);
+
+    /* second run through: add keys to table */
+
+    total = 0;
+    q = ngx_queue_last(&ctx->sh->queue);
+
+    while (q != ngx_queue_sentinel(&ctx->sh->queue)) {
+        prev = ngx_queue_prev(q);
+
+        sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
+
+        if (sd->expires == 0 || sd->expires > now) {
+            lua_pushlstring(L, (char *) sd->data, sd->key_len);
+            lua_rawseti(L, -2, ++total);
+            if (attempts && total == attempts) {
+                break;
+            }
+        }
+
+        q = prev;
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    /* table is at top of stack */
+    return 1;
+}
+
+
 static int
 ngx_http_lua_shdict_add(lua_State *L)
 {
@@ -541,9 +742,6 @@ ngx_http_lua_shdict_set(lua_State *L)
 static int
 ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
 {
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-#endif
     int                          i, n;
     ngx_str_t                    name;
     ngx_str_t                    key;
@@ -583,12 +781,6 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
 
     name = ctx->name;
 
-#if (NGX_DEBUG)
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-#endif
-
     key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
 
     if (key.len == 0) {
@@ -656,8 +848,7 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
     ngx_http_lua_shdict_expire(ctx, 1);
 #endif
 
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len,
-            &sd);
+    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
 
     dd("shdict lookup returned %d", (int) rc);
 
@@ -710,7 +901,7 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
 replace:
         if (value.data && value.len == (size_t) sd->value_len) {
 
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
                 "lua shared dict set: found old entry and value size matched, "
                 "reusing it");
 
@@ -747,7 +938,7 @@ replace:
             return 3;
         }
 
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
             "lua shared dict set: found old entry bug value size NOT matched, "
             "removing it first");
 
@@ -775,7 +966,7 @@ insert:
         return 3;
     }
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
         "lua shared dict set: creating a new entry");
 
     n = offsetof(ngx_rbtree_node_t, color)
@@ -787,7 +978,7 @@ insert:
 
     if (node == NULL) {
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
             "lua shared dict set: overriding non-expired items due to memory "
             "shortage for entry \"%V\"", &name);
 
@@ -906,8 +1097,7 @@ ngx_http_lua_shdict_incr(lua_State *L)
     ngx_http_lua_shdict_expire(ctx, 1);
 #endif
 
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len,
-            &sd);
+    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
 
     dd("shdict lookup returned %d", (int) rc);
 
@@ -949,3 +1139,142 @@ ngx_http_lua_shdict_incr(lua_State *L)
     return 2;
 }
 
+
+ngx_int_t
+ngx_http_lua_shared_dict_get(ngx_shm_zone_t *zone, u_char *key_data,
+    size_t key_len, ngx_http_lua_value_t *value)
+{
+    u_char                      *data;
+    size_t                       len;
+    uint32_t                     hash;
+    ngx_int_t                    rc;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_http_lua_shdict_node_t  *sd;
+
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
+    hash = ngx_crc32_short(key_data, key_len);
+
+    ctx = zone->data;
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+    rc = ngx_http_lua_shdict_lookup(zone, hash, key_data, key_len, &sd);
+
+    dd("shdict lookup returned %d", (int) rc);
+
+    if (rc == NGX_DECLINED || rc == NGX_DONE) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        return rc;
+    }
+
+    /* rc == NGX_OK */
+
+    value->type = sd->value_type;
+
+    dd("type: %d", (int) value->type);
+
+    data = sd->data + sd->key_len;
+    len = (size_t) sd->value_len;
+
+    switch (value->type) {
+    case LUA_TSTRING:
+
+        if (value->value.s.data == NULL || value->value.s.len == 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "no string buffer "
+                          "initialized");
+            return NGX_ERROR;
+        }
+
+        if (len > value->value.s.len) {
+            len = value->value.s.len;
+
+        } else {
+            value->value.s.len = len;
+        }
+
+        ngx_memcpy(value->value.s.data, data, len);
+        break;
+
+    case LUA_TNUMBER:
+
+        if (len != sizeof(lua_Number)) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "bad lua number "
+                          "value size found for key %*s: %lu", key_len,
+                          key_data, (unsigned long) len);
+
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(&value->value.b, data, len);
+        break;
+
+    case LUA_TBOOLEAN:
+
+        if (len != sizeof(u_char)) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "bad lua boolean "
+                          "value size found for key %*s: %lu", key_len,
+                          key_data, (unsigned long) len);
+
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+            return NGX_ERROR;
+        }
+
+        value->value.b = *data;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "bad lua value type "
+                      "found for key %*s: %d", key_len, key_data,
+                      (int) value->type);
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+        return NGX_ERROR;
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+    return NGX_OK;
+}
+
+
+ngx_shm_zone_t *
+ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
+{
+    ngx_str_t                       *name;
+    ngx_uint_t                       i;
+    ngx_shm_zone_t                  *zone;
+    volatile ngx_list_part_t        *part;
+
+    part = &ngx_cycle->shared_memory.part;
+    zone = part->elts;
+
+    for (i = 0; /* void */ ; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+            part = part->next;
+            zone = part->elts;
+            i = 0;
+        }
+
+        name = &zone[i].shm.name;
+
+        dd("name: [%.*s] %d", (int) name->len, name->data, (int) name->len);
+        dd("name2: [%.*s] %d", (int) name_len, name_data, (int) name_len);
+
+        if (name->len == name_len
+            && ngx_strncmp(name->data, name_data, name_len) == 0)
+        {
+            return zone;
+        }
+    }
+
+    return NULL;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
index 0bcf446..096f605 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
@@ -29,6 +29,8 @@ typedef struct {
     ngx_http_lua_shdict_shctx_t  *sh;
     ngx_slab_pool_t              *shpool;
     ngx_str_t                     name;
+    ngx_http_lua_main_conf_t     *main_conf;
+    ngx_log_t                    *log;
 } ngx_http_lua_shdict_ctx_t;
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
new file mode 100644
index 0000000..fb0f769
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
@@ -0,0 +1,181 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_sleep.h"
+#include "ngx_http_lua_contentby.h"
+
+
+static int ngx_http_lua_ngx_sleep(lua_State *L);
+static void ngx_http_lua_sleep_handler(ngx_event_t *ev);
+static void ngx_http_lua_sleep_cleanup(void *data);
+static ngx_int_t ngx_http_lua_sleep_resume(ngx_http_request_t *r);
+
+
+static int
+ngx_http_lua_ngx_sleep(lua_State *L)
+{
+    int                          n;
+    ngx_int_t                    delay; /* in msec */
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
+
+    n = lua_gettop(L);
+    if (n != 1) {
+        return luaL_error(L, "attempt to pass %d arguments, but accepted 1", n);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    delay = luaL_checknumber(L, 1) * 1000;
+
+    if (delay < 0) {
+        return luaL_error(L, "invalid sleep duration \"%d\"", delay);
+    }
+
+    if (delay == 0) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua sleep for 0ms");
+        return 0;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    coctx = ctx->cur_co_ctx;
+    if (coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
+    }
+
+    coctx->data = r;
+
+    coctx->sleep.handler = ngx_http_lua_sleep_handler;
+    coctx->sleep.data = coctx;
+    coctx->sleep.log = r->connection->log;
+
+    dd("adding timer with delay %lu ms, r:%.*s", (unsigned long) delay,
+            (int) r->uri.len, r->uri.data);
+
+    ngx_add_timer(&coctx->sleep, (ngx_msec_t) delay);
+
+    coctx->cleanup = ngx_http_lua_sleep_cleanup;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua ready to sleep for %d ms", delay);
+
+    return lua_yield(L, 0);
+}
+
+
+void
+ngx_http_lua_sleep_handler(ngx_event_t *ev)
+{
+    ngx_connection_t        *c;
+    ngx_http_request_t      *r;
+    ngx_http_lua_ctx_t      *ctx;
+    ngx_http_log_ctx_t      *log_ctx;
+    ngx_http_lua_co_ctx_t   *coctx;
+
+    coctx = ev->data;
+
+    r = coctx->data;
+    c = r->connection;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx == NULL) {
+        return;
+    }
+
+    log_ctx = c->log->data;
+    log_ctx->current_request = r;
+
+    coctx->cleanup = NULL;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "lua sleep timer expired: \"%V?%V\"", &r->uri, &r->args);
+
+    ctx->cur_co_ctx = coctx;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_sleep_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_sleep_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+void
+ngx_http_lua_inject_sleep_api(lua_State *L)
+{
+    lua_pushcfunction(L, ngx_http_lua_ngx_sleep);
+    lua_setfield(L, -2, "sleep");
+}
+
+
+static void
+ngx_http_lua_sleep_cleanup(void *data)
+{
+    ngx_http_lua_co_ctx_t          *coctx = data;
+
+    if (coctx->sleep.timer_set) {
+        dd("cleanup: deleting timer for ngx.sleep");
+
+        ngx_del_timer(&coctx->sleep);
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_sleep_resume(ngx_http_request_t *r)
+{
+    ngx_connection_t            *c;
+    ngx_int_t                    rc;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    c = r->connection;
+
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.h b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.h
new file mode 100644
index 0000000..9009d5e
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.h
@@ -0,0 +1,11 @@
+#ifndef NGX_HTTP_LUA_SLEEP_H
+#define NGX_HTTP_LUA_SLEEP_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_sleep_api(lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_SLEEP_H */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
similarity index 72%
rename from debian/modules/nginx-lua/src/ngx_http_lua_socket.c
rename to debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index d551071..c46b7cc 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -3,18 +3,18 @@
 #endif
 #include "ddebug.h"
 
-#include "ngx_http_lua_socket.h"
+
+#include "ngx_http_lua_socket_tcp.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_output.h"
 #include "ngx_http_lua_contentby.h"
+#include "ngx_http_lua_probe.h"
 
 
-#define NGX_HTTP_LUA_SOCKET_FT_ERROR        0x0001
-#define NGX_HTTP_LUA_SOCKET_FT_TIMEOUT      0x0002
-#define NGX_HTTP_LUA_SOCKET_FT_CLOSED       0x0004
-#define NGX_HTTP_LUA_SOCKET_FT_RESOLVER     0x0008
-#define NGX_HTTP_LUA_SOCKET_FT_BUFTOOSMALL  0x0010
-#define NGX_HTTP_LUA_SOCKET_FT_NOMEM        0x0020
+#if 1
+#undef ngx_http_lua_probe_info
+#define ngx_http_lua_probe_info(msg)
+#endif
 
 
 static int ngx_http_lua_socket_tcp(lua_State *L);
@@ -28,40 +28,40 @@ static void ngx_http_lua_socket_tcp_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_lua_socket_tcp_get_peer(ngx_peer_connection_t *pc,
     void *data);
 static void ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static void ngx_http_lua_socket_send_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static void ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
-static void ngx_http_lua_socket_cleanup(void *data);
+    ngx_http_lua_socket_tcp_upstream_t *u);
+static void ngx_http_lua_socket_tcp_cleanup(void *data);
 static void ngx_http_lua_req_socket_cleanup(void *data);
-static void ngx_http_lua_socket_finalize(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+static void ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static ngx_int_t ngx_http_lua_socket_send(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static ngx_int_t ngx_http_lua_socket_test_connect(ngx_connection_t *c);
 static void ngx_http_lua_socket_handle_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, ngx_uint_t ft_type);
+    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type);
 static void ngx_http_lua_socket_handle_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_send_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static int ngx_http_lua_socket_tcp_connect_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static void ngx_http_lua_socket_dummy_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
-static ngx_int_t ngx_http_lua_socket_read(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
+static ngx_int_t ngx_http_lua_socket_tcp_read(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static void ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static ngx_int_t ngx_http_lua_socket_read_line(void *data, ssize_t bytes);
 static void ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx);
 static int ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static int ngx_http_lua_socket_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static ngx_int_t ngx_http_lua_socket_read_all(void *data, ssize_t bytes);
 static ngx_int_t ngx_http_lua_socket_read_until(void *data, ssize_t bytes);
 static ngx_int_t ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes);
@@ -76,24 +76,27 @@ static int ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L);
 static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L);
 static ngx_int_t ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
     lua_State *L, int key_index,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static void ngx_http_lua_socket_keepalive_dummy_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_lua_socket_keepalive_close_handler(ngx_event_t *ev);
 static void ngx_http_lua_socket_keepalive_rev_handler(ngx_event_t *ev);
 static void ngx_http_lua_socket_free_pool(ngx_log_t *log,
     ngx_http_lua_socket_pool_t *spool);
-static int ngx_http_lua_socket_upstream_destroy(lua_State *L);
+static int ngx_http_lua_socket_tcp_upstream_destroy(lua_State *L);
 static int ngx_http_lua_socket_downstream_destroy(lua_State *L);
 static ngx_int_t ngx_http_lua_socket_push_input_data(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_socket_tcp_upstream_t *u,
+    lua_State *L);
 static ngx_int_t ngx_http_lua_socket_add_pending_data(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, u_char *pos, size_t len, u_char *pat,
+    ngx_http_lua_socket_tcp_upstream_t *u, u_char *pos, size_t len, u_char *pat,
     int prefix, int old_state);
 static ngx_int_t ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+    ngx_http_lua_socket_tcp_upstream_t *u);
 static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, u_char *pat, size_t prefix);
-static ngx_int_t ngx_http_lua_test_expect(ngx_http_request_t *r);
+    ngx_http_lua_socket_tcp_upstream_t *u, u_char *pat, size_t prefix);
+static ngx_int_t ngx_http_lua_socket_tcp_resume(ngx_http_request_t *r);
+static void ngx_http_lua_tcp_resolve_cleanup(void *data);
+static void ngx_http_lua_tcp_socket_cleanup(void *data);
 
 
 enum {
@@ -103,12 +106,16 @@ enum {
 };
 
 
+static char ngx_http_lua_req_socket_metatable_key;
+static char ngx_http_lua_tcp_socket_metatable_key;
+
+
 void
-ngx_http_lua_inject_socket_api(ngx_log_t *log, lua_State *L)
+ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 {
     ngx_int_t         rc;
 
-    lua_createtable(L, 0, 2 /* nrec */);    /* ngx.socket */
+    lua_createtable(L, 0, 3 /* nrec */);    /* ngx.socket */
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp);
     lua_setfield(L, -2, "tcp");
@@ -130,8 +137,10 @@ ngx_http_lua_inject_socket_api(ngx_log_t *log, lua_State *L)
         lua_setfield(L, -2, "connect");
     }
 
-    /* {{{req socket object metatable */
+    lua_setfield(L, -2, "socket");
 
+    /* {{{req socket object metatable */
+    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 4 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -145,12 +154,12 @@ ngx_http_lua_inject_socket_api(ngx_log_t *log, lua_State *L)
 
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "__index");
-    lua_setfield(L, -3, "_reqsock_meta");
 
+    lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
 
     /* {{{tcp object metatable */
-
+    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 10 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
@@ -182,11 +191,8 @@ ngx_http_lua_inject_socket_api(ngx_log_t *log, lua_State *L)
 
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "__index");
-    lua_setfield(L, -3, "_tcp_meta");
-
+    lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
-
-    lua_setfield(L, -2, "socket");
 }
 
 
@@ -201,24 +207,36 @@ ngx_http_lua_inject_req_socket_api(lua_State *L)
 static int
 ngx_http_lua_socket_tcp(lua_State *L)
 {
+    ngx_http_request_t      *r;
+    ngx_http_lua_ctx_t      *ctx;
+
     if (lua_gettop(L) != 0) {
         return luaL_error(L, "expecting zero arguments, but got %d",
-                lua_gettop(L));
+                          lua_gettop(L));
     }
 
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
-    lua_getglobal(L, "ngx");
-    lua_getfield(L, -1, "_tcp_meta");
-
-#if 0
-    dd("meta table: %s", luaL_typename(L, -1));
-    lua_getfield(L, -1, "connect");
-    dd("connect method: %s", luaL_typename(L, -1));
-    lua_pop(L, 1);
-#endif
-
-    lua_setmetatable(L, -3);
-    lua_pop(L, 1);
+    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, -2);
 
     dd("top: %d", lua_gettop(L));
 
@@ -244,19 +262,39 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_peer_connection_t       *pc;
     int                          timeout;
+    unsigned                     custom_pool;
+    int                          key_index;
+    const char                  *msg;
+    ngx_http_lua_co_ctx_t       *coctx;
 
-    ngx_http_lua_socket_upstream_t          *u;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
 
     n = lua_gettop(L);
-    if (n != 2 && n != 3) {
-        return luaL_error(L, "ngx.socket connect: expecting 2 or 3 arguments "
-                          "(including the object), but seen %d", n);
+    if (n != 2 && n != 3 && n != 4) {
+        return luaL_error(L, "ngx.socket connect: expecting 2, 3, or 4 "
+                          "arguments (including the object), but seen %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
     p = (u_char *) luaL_checklstring(L, 2, &len);
 
     host.data = ngx_palloc(r->pool, len + 1);
@@ -269,6 +307,39 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     ngx_memcpy(host.data, p, len);
     host.data[len] = '\0';
 
+    key_index = 2;
+    custom_pool = 0;
+
+    if (lua_type(L, n) == LUA_TTABLE) {
+
+        /* found the last optional option table */
+
+        lua_getfield(L, n, "pool");
+
+        switch (lua_type(L, -1)) {
+        case LUA_TNUMBER:
+            lua_tostring(L, -1);
+
+        case LUA_TSTRING:
+            custom_pool = 1;
+
+            lua_pushvalue(L, -1);
+            lua_rawseti(L, 1, SOCKET_KEY_INDEX);
+
+            key_index = n + 1;
+
+            break;
+
+        default:
+            msg = lua_pushfstring(L, "bad \"pool\" option type: %s",
+                                  luaL_typename(L, -1));
+            luaL_argerror(L, n, msg);
+            break;
+        }
+
+        n--;
+    }
+
     if (n == 3) {
         port = luaL_checkinteger(L, 3);
 
@@ -278,9 +349,11 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
             return 2;
         }
 
-        lua_pushliteral(L, ":");
-        lua_insert(L, 3);
-        lua_concat(L, 3);
+        if (!custom_pool) {
+            lua_pushliteral(L, ":");
+            lua_insert(L, 3);
+            lua_concat(L, 3);
+        }
 
         dd("socket key: %s", lua_tostring(L, -1));
 
@@ -288,39 +361,47 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         port = 0;
     }
 
-    /* the key's index is 2 */
+    if (!custom_pool) {
+        /* the key's index is 2 */
 
-    lua_pushvalue(L, -1);
-    lua_rawseti(L, 1, SOCKET_KEY_INDEX);
+        lua_pushvalue(L, 2);
+        lua_rawseti(L, 1, SOCKET_KEY_INDEX);
+    }
 
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     if (u) {
+        if (u->waiting) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "socket busy");
+            return 2;
+        }
+
         if (u->is_downstream) {
             return luaL_error(L, "attempt to re-connect a request socket");
         }
 
         if (u->peer.connection) {
             ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua socket reconnect without shutting down");
+                           "lua tcp socket reconnect without shutting down");
 
-            ngx_http_lua_socket_finalize(r, u);
+            ngx_http_lua_socket_tcp_finalize(r, u);
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "lua reuse socket upstream ctx");
 
     } else {
-        u = lua_newuserdata(L, sizeof(ngx_http_lua_socket_upstream_t));
+        u = lua_newuserdata(L, sizeof(ngx_http_lua_socket_tcp_upstream_t));
         if (u == NULL) {
             return luaL_error(L, "out of memory");
         }
 
 #if 1
         lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
-        lua_pushcfunction(L, ngx_http_lua_socket_upstream_destroy);
+        lua_pushcfunction(L, ngx_http_lua_socket_tcp_upstream_destroy);
         lua_setfield(L, -2, "__gc");
         lua_setmetatable(L, -2);
 #endif
@@ -328,9 +409,12 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         lua_rawseti(L, 1, SOCKET_CTX_INDEX);
     }
 
-    ngx_memzero(u, sizeof(ngx_http_lua_socket_upstream_t));
+    ngx_memzero(u, sizeof(ngx_http_lua_socket_tcp_upstream_t));
+
+    coctx = ctx->cur_co_ctx;
 
     u->request = r; /* set the controlling request */
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     u->conf = llcf;
@@ -359,7 +443,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     r->connection->single_connection = 0;
 
-    rc = ngx_http_lua_get_keepalive_peer(r, L, 2, u);
+    rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
 
     if (rc == NGX_OK) {
         lua_pushinteger(L, 1);
@@ -396,7 +480,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket connect timeout: %M", u->connect_timeout);
+                   "lua tcp socket connect timeout: %M", u->connect_timeout);
 
     u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
     if (u->resolved == NULL) {
@@ -405,7 +489,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     if (url.addrs && url.addrs[0].sockaddr) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket network address given directly");
+                       "lua tcp socket network address given directly");
 
         u->resolved->sockaddr = url.addrs[0].sockaddr;
         u->resolved->socklen = url.addrs[0].socklen;
@@ -451,12 +535,17 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     rctx->timeout = clcf->resolver_timeout;
 
     u->resolved->ctx = rctx;
+    u->co_ctx = ctx->cur_co_ctx;
+
+    coctx->data = u;
 
     saved_top = lua_gettop(L);
 
+    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
+
     if (ngx_resolve_name(rctx) != NGX_OK) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket fail to run resolver immediately");
+                       "lua tcp socket fail to run resolver immediately");
 
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
 
@@ -467,8 +556,6 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         return 2;
     }
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
     if (u->waiting == 1) {
         /* resolved and already connecting */
         return lua_yield(L, 0);
@@ -483,16 +570,11 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     /* still resolving */
 
-    ctx->data = u;
-    ctx->socket_busy = 1;
-
-    dd("setting socket_ready to 0");
-
-    ctx->socket_ready = 0;
-
     u->waiting = 1;
     u->prepare_retvals = ngx_http_lua_socket_resolve_retval_handler;
 
+    dd("setting data to %p", u);
+
     if (ctx->entered_content_phase) {
         r->write_event_handler = ngx_http_lua_content_wev_handler;
     }
@@ -508,7 +590,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
     ngx_http_upstream_resolved_t        *ur;
     ngx_http_lua_ctx_t                  *lctx;
     lua_State                           *L;
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
     u_char                              *p;
     size_t                               len;
     struct sockaddr_in                  *sin;
@@ -520,22 +602,24 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
     ur = u->resolved;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket resolve handler");
+                   "lua tcp socket resolve handler");
 
     lctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (lctx == NULL) {
+        return;
+    }
 
-    L = lctx->cc;
+    lctx->cur_co_ctx = u->co_ctx;
 
-    dd("setting socket_ready to 1");
+    u->co_ctx->cleanup = NULL;
 
-    lctx->socket_busy = 0;
-    lctx->socket_ready = 1;
+    L = lctx->cur_co_ctx->co;
 
     waiting = u->waiting;
 
     if (ctx->state) {
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket resolver error: %s (waiting: %d)",
+                       "lua tcp socket resolver error: %s (waiting: %d)",
                        ngx_resolver_strerror(ctx->state), (int) u->waiting);
 
         lua_pushnil(L);
@@ -548,11 +632,6 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
         u->prepare_retvals = ngx_http_lua_socket_error_retval_handler;
         ngx_http_lua_socket_handle_error(r, u,
                                          NGX_HTTP_LUA_SOCKET_FT_RESOLVER);
-
-        if (waiting) {
-            ngx_http_run_posted_requests(r->connection);
-        }
-
         return;
     }
 
@@ -578,6 +657,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
 #endif
 
     if (ur->naddrs == 0) {
+        ngx_resolve_name_done(ctx);
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
 
         lua_pushnil(L);
@@ -596,8 +676,9 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
 
     len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
 
-    p = ngx_pnalloc(r->pool, len);
+    p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
     if (p == NULL) {
+        ngx_resolve_name_done(ctx);
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
 
         lua_pushnil(L);
@@ -605,18 +686,12 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
         return;
     }
 
+    sin = (struct sockaddr_in *) &p[len];
+    ngx_memzero(sin, sizeof(struct sockaddr_in));
+
     len = ngx_inet_ntop(AF_INET, &ur->addrs[i], p, NGX_INET_ADDRSTRLEN);
     len = ngx_sprintf(&p[len], ":%d", ur->port) - p;
 
-    sin = ngx_pcalloc(r->pool, sizeof(struct sockaddr_in));
-    if (sin == NULL) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "out of memory");
-        return;
-    }
-
     sin->sin_family = AF_INET;
     sin->sin_port = htons(ur->port);
     sin->sin_addr.s_addr = ur->addrs[i];
@@ -634,13 +709,19 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
 
     u->waiting = 0;
 
-    (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
+    if (waiting) {
+        lctx->resume_handler = ngx_http_lua_socket_tcp_resume;
+        r->write_event_handler(r);
+
+    } else {
+        (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
+    }
 }
 
 
 static int
 ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L)
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
 {
     ngx_http_lua_ctx_t              *ctx;
     ngx_peer_connection_t           *pc;
@@ -648,9 +729,10 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
     ngx_http_cleanup_t              *cln;
     ngx_http_upstream_resolved_t    *ur;
     ngx_int_t                        rc;
+    ngx_http_lua_co_ctx_t           *coctx;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket resolve retval handler");
+                   "lua tcp socket resolve retval handler");
 
     if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_RESOLVER) {
         return 2;
@@ -675,6 +757,10 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 
     rc = ngx_event_connect_peer(pc);
 
+    if (rc == NGX_ERROR) {
+        u->socket_errno = ngx_socket_errno;
+    }
+
     if (u->cleanup == NULL) {
         cln = ngx_http_cleanup_add(r, 0);
         if (cln == NULL) {
@@ -684,7 +770,7 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
             return 2;
         }
 
-        cln->handler = ngx_http_lua_socket_cleanup;
+        cln->handler = ngx_http_lua_socket_tcp_cleanup;
         cln->data = u;
         u->cleanup = &cln->handler;
     }
@@ -693,10 +779,7 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
                    "lua tcp socket connect: %i", rc);
 
     if (rc == NGX_ERROR) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-        lua_pushnil(L);
-        lua_pushliteral(L, "connect peer error");
-        return 2;
+        return ngx_http_lua_socket_error_retval_handler(r, u, L);
     }
 
     if (rc == NGX_BUSY) {
@@ -726,7 +809,6 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
     u->read_event_handler = ngx_http_lua_socket_connected_handler;
 
     c->sendfile &= r->connection->sendfile;
-    u->output.sendfile = c->sendfile;
 
     c->pool = r->pool;
     c->log = r->connection->log;
@@ -735,19 +817,22 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 
     /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */
 
+#if 0
     u->writer.out = NULL;
     u->writer.last = &u->writer.out;
-    u->writer.connection = c;
-    u->writer.limit = 0;
-    u->request_sent = 0;
+#endif
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
-    ctx->data = u;
+    coctx = ctx->cur_co_ctx;
+
+    dd("setting data to %p", u);
+
+    coctx->data = u;
 
     if (rc == NGX_OK) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket connected: fd:%d", (int) c->fd);
+                       "lua tcp socket connected: fd:%d", (int) c->fd);
 
         /* We should delete the current write/read event
          * here because the socket object may not be used immediately
@@ -770,13 +855,6 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
             return 2;
         }
 
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-        dd("setting socket_ready to 1");
-
-        ctx->socket_busy = 0;
-        ctx->socket_ready = 1;
-
         u->read_event_handler = ngx_http_lua_socket_dummy_handler;
         u->write_event_handler = ngx_http_lua_socket_dummy_handler;
 
@@ -786,21 +864,19 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 
     /* rc == NGX_AGAIN */
 
+    coctx->cleanup = ngx_http_lua_tcp_socket_cleanup;
+
     ngx_add_timer(c->write, u->connect_timeout);
 
     if (ctx->entered_content_phase) {
         r->write_event_handler = ngx_http_lua_content_wev_handler;
     }
 
+    u->co_ctx = ctx->cur_co_ctx;
     u->waiting = 1;
-
     u->prepare_retvals = ngx_http_lua_socket_tcp_connect_retval_handler;
 
-    dd("setting socket_ready to 0");
-
-    ctx->socket_busy = 1;
-
-    ctx->socket_ready = 0;
+    dd("setting data to %p", u);
 
     if (ctx->entered_content_phase) {
         r->write_event_handler = ngx_http_lua_content_wev_handler;
@@ -812,15 +888,19 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 
 static int
 ngx_http_lua_socket_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L)
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
 {
     u_char           errstr[NGX_MAX_ERROR_STR];
     u_char          *p;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket error retval handler");
+                   "lua tcp socket error retval handler");
 
-    ngx_http_lua_socket_finalize(r, u);
+    if (u->co_ctx) {
+        u->co_ctx->cleanup = NULL;
+    }
+
+    ngx_http_lua_socket_tcp_finalize(r, u);
 
     if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_RESOLVER) {
         return 2;
@@ -840,6 +920,9 @@ ngx_http_lua_socket_error_retval_handler(ngx_http_request_t *r,
     } else if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_NOMEM) {
         lua_pushliteral(L, "out of memory");
 
+    } else if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT) {
+        lua_pushliteral(L, "client aborted");
+
     } else {
 
         if (u->socket_errno) {
@@ -863,7 +946,7 @@ ngx_http_lua_socket_error_retval_handler(ngx_http_request_t *r,
 
 static int
 ngx_http_lua_socket_tcp_connect_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L)
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
 {
     if (u->ft_type) {
         return ngx_http_lua_socket_error_retval_handler(r, u, L);
@@ -878,7 +961,7 @@ static int
 ngx_http_lua_socket_tcp_receive(lua_State *L)
 {
     ngx_http_request_t                  *r;
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_int_t                            rc;
     ngx_http_lua_ctx_t                  *ctx;
     int                                  n;
@@ -886,6 +969,8 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
     lua_Integer                          bytes;
     char                                *p;
     int                                  typ;
+    ngx_http_lua_loc_conf_t             *llcf;
+    ngx_http_lua_co_ctx_t               *coctx;
 
     n = lua_gettop(L);
     if (n != 1 && n != 2) {
@@ -893,32 +978,44 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
                           "(including the object), but got %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket calling receive() method");
+                   "lua tcp socket calling receive() method");
 
-    /* luaL_checktype(L, 1, LUA_TTABLE); */
+    luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
 
     if (u == NULL || u->peer.connection == NULL || u->ft_type || u->eof) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "attempt to receive data on a closed socket: u:%p, c:%p, "
-                      "ft:%ui eof:%ud",
-                      u, u ? u->peer.connection : NULL, u ? u->ft_type : 0,
-                      u ? u->eof : 0);
+
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "attempt to receive data on a closed socket: u:%p, "
+                          "c:%p, ft:%ui eof:%ud",
+                          u, u ? u->peer.connection : NULL, u ? u->ft_type : 0,
+                          u ? u->eof : 0);
+        }
 
         lua_pushnil(L);
         lua_pushliteral(L, "closed");
         return 2;
     }
 
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket read timeout: %M", u->read_timeout);
+                   "lua tcp socket read timeout: %M", u->read_timeout);
 
     if (n > 1) {
         if (lua_isnumber(L, 2)) {
@@ -1002,9 +1099,13 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
 
     dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
 
+    if (u->is_downstream) {
+        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    }
+
     u->waiting = 0;
 
-    rc = ngx_http_lua_socket_read(r, u);
+    rc = ngx_http_lua_socket_tcp_read(r, u);
 
     if (rc == NGX_ERROR) {
         dd("read failed: %d", (int) u->ft_type);
@@ -1016,7 +1117,7 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
     if (rc == NGX_OK) {
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket receive done in a single run");
+                       "lua tcp socket receive done in a single run");
 
         return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
     }
@@ -1026,19 +1127,25 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
     u->read_event_handler = ngx_http_lua_socket_read_handler;
     u->write_event_handler = ngx_http_lua_socket_dummy_handler;
 
+    ctx->cur_co_ctx->cleanup = ngx_http_lua_tcp_socket_cleanup;
+
     if (ctx->entered_content_phase) {
         r->write_event_handler = ngx_http_lua_content_wev_handler;
     }
 
+    u->co_ctx = ctx->cur_co_ctx;
     u->waiting = 1;
-
-    ctx->data = u;
     u->prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
 
-    dd("setting socket_ready to 0");
+    coctx = ctx->cur_co_ctx;
 
-    ctx->socket_busy = 1;
-    ctx->socket_ready = 0;
+    dd("setting data to %p, coctx:%p", u, coctx);
+
+    coctx->data = u;
+
+    if (u->is_downstream) {
+        ctx->req_body_reader_co_ctx = coctx;
+    }
 
     return lua_yield(L, 0);
 }
@@ -1047,7 +1154,7 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
 static ngx_int_t
 ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 {
-    ngx_http_lua_socket_upstream_t      *u = data;
+    ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
     ngx_buf_t                   *b;
 #if (NGX_DEBUG)
@@ -1057,7 +1164,7 @@ ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 #endif
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket read chunk %z", bytes);
+                   "lua tcp socket read chunk %z", bytes);
 
     if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
@@ -1088,7 +1195,7 @@ ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 static ngx_int_t
 ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 {
-    ngx_http_lua_socket_upstream_t      *u = data;
+    ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
     ngx_buf_t                   *b;
 #if (NGX_DEBUG)
@@ -1098,7 +1205,7 @@ ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 #endif
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket read all");
+                   "lua tcp socket read all");
 
     if (bytes == 0) {
         return NGX_OK;
@@ -1116,7 +1223,7 @@ ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 static ngx_int_t
 ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 {
-    ngx_http_lua_socket_upstream_t      *u = data;
+    ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
     ngx_buf_t                   *b;
     u_char                      *dst;
@@ -1126,7 +1233,7 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 #endif
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua socket read line");
+                   "lua tcp socket read line");
 
     if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
@@ -1154,7 +1261,7 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
         switch (c) {
         case '\n':
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                           "lua socket read the final line part: \"%*s\"",
+                           "lua tcp socket read the final line part: \"%*s\"",
                            b->pos - 1 - begin, begin);
 
             u->buf_in->buf->last = dst;
@@ -1177,7 +1284,7 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 
 #if (NGX_DEBUG)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua socket read partial line data: %*s",
+                   "lua tcp socket read partial line data: %*s",
                    dst - begin, begin);
 #endif
 
@@ -1188,8 +1295,8 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 
 
 static ngx_int_t
-ngx_http_lua_socket_read(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+ngx_http_lua_socket_tcp_read(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_int_t                    rc;
     ngx_connection_t            *c;
@@ -1199,12 +1306,13 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
     ssize_t                      n;
     unsigned                     read;
     size_t                       preread = 0;
+    ngx_http_lua_loc_conf_t     *llcf;
 
     c = u->peer.connection;
     rev = c->read;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "lua socket read data: waiting: %d", (int) u->waiting);
+                   "lua tcp socket read data: waiting: %d", (int) u->waiting);
 
     b = &u->buffer;
     read = 0;
@@ -1218,17 +1326,48 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
             rc = u->input_filter(u->input_filter_ctx, size);
 
             if (rc == NGX_OK) {
+
                 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "lua socket receive done: wait:%d, eof:%d, "
+                               "lua tcp socket receive done: wait:%d, eof:%d, "
                                "uri:\"%V?%V\"", (int) u->waiting, (int) u->eof,
                                &r->uri, &r->args);
 
+                if (u->is_downstream
+                    && b->last == b->pos
+                    && r->request_body->rest == 0)
+                {
+
+                    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+                    if (llcf->check_client_abort) {
+                        rc = ngx_http_lua_check_broken_connection(r, rev);
+
+                        if (rc == NGX_OK) {
+                            goto success;
+                        }
+
+                        if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
+                            ngx_http_lua_socket_handle_error(r, u,
+                                         NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT);
+
+                        } else {
+                            ngx_http_lua_socket_handle_error(r, u,
+                                             NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                        }
+
+                        return NGX_ERROR;
+                    }
+                }
+
+#if 1
                 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
                     ngx_http_lua_socket_handle_error(r, u,
                                      NGX_HTTP_LUA_SOCKET_FT_ERROR);
                     return NGX_ERROR;
                 }
+#endif
 
+success:
                 ngx_http_lua_socket_handle_success(r, u);
                 return NGX_OK;
             }
@@ -1295,14 +1434,18 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
                 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                                "http client request body preread %uz", preread);
 
-                if ((off_t) preread >= r->headers_in.content_length_n) {
-                    preread = r->headers_in.content_length_n;
+                if ((off_t) preread >= r->request_body->rest) {
+                    preread = r->request_body->rest;
                 }
 
                 if (size > preread) {
                     size = preread;
                 }
 
+                ngx_http_lua_probe_req_socket_consume_preread(r,
+                                                              r->header_in->pos,
+                                                              size);
+
                 b->last = ngx_copy(b->last, r->header_in->pos, size);
 
                 r->header_in->pos += size;
@@ -1328,8 +1471,8 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
 #endif
 
         ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket try to recv data %uz: \"%V?%V\"",
-                       (int) size, &r->uri, &r->args);
+                       "lua tcp socket try to recv data %uz: \"%V?%V\"",
+                       size, &r->uri, &r->args);
 
         n = c->recv(c, b->last, size);
 
@@ -1338,7 +1481,7 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
         read = 1;
 
         ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket recv returned %d: \"%V?%V\"",
+                       "lua tcp socket recv returned %d: \"%V?%V\"",
                        (int) n, &r->uri, &r->args);
 
         if (n == NGX_AGAIN) {
@@ -1348,15 +1491,37 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
         }
 
         if (n == 0) {
+
+            if (u->is_downstream) {
+
+                llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+                if (llcf->check_client_abort) {
+
+                    ngx_http_lua_socket_handle_error(r, u,
+                                         NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT);
+                    return NGX_ERROR;
+                }
+
+                /* llcf->check_client_abort == 0 */
+
+                if (r->request_body->rest) {
+                    ngx_http_lua_socket_handle_error(r, u,
+                                         NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT);
+                    return NGX_ERROR;
+                }
+            }
+
             u->eof = 1;
 
             ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua socket closed");
+                           "lua tcp socket closed");
 
             continue;
         }
 
         if (n == NGX_ERROR) {
+            u->socket_errno = ngx_socket_errno;
             ngx_http_lua_socket_handle_error(r, u,
                                              NGX_HTTP_LUA_SOCKET_FT_ERROR);
             return NGX_ERROR;
@@ -1370,11 +1535,13 @@ ngx_http_lua_socket_read(ngx_http_request_t *r,
         }
     }
 
+#if 1
     if (ngx_handle_read_event(rev, 0) != NGX_OK) {
         ngx_http_lua_socket_handle_error(r, u,
                                          NGX_HTTP_LUA_SOCKET_FT_ERROR);
         return NGX_ERROR;
     }
+#endif
 
     if (rev->active) {
         ngx_add_timer(rev, u->read_timeout);
@@ -1394,49 +1561,61 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
     ngx_http_request_t                  *r;
     u_char                              *p;
     size_t                               len;
-    ngx_http_core_loc_conf_t            *clcf;
     ngx_chain_t                         *cl;
     ngx_http_lua_ctx_t                  *ctx;
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
     int                                  type;
     const char                          *msg;
     ngx_buf_t                           *b;
+    ngx_http_lua_loc_conf_t             *llcf;
+    ngx_http_lua_co_ctx_t               *coctx;
 
     /* TODO: add support for the optional "i" and "j" arguments */
 
     if (lua_gettop(L) != 2) {
-        return luaL_error(L, "expecting two arguments (one for the object), "
+        return luaL_error(L, "expecting 2 arguments (including the object), "
                           "but got %d", lua_gettop(L));
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    /* luaL_checktype(L, 1, LUA_TTABLE); */
+    luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     if (u == NULL || u->peer.connection == NULL || u->ft_type || u->eof) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "attempt to send data on a closed socket: u:%p, c:%p, "
-                      "ft:%ui eof:%ud",
-                      u, u ? u->peer.connection : NULL, u ? u->ft_type : 0,
-                      u ? u->eof : 0);
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "attempt to send data on a closed socket: u:%p, "
+                          "c:%p, ft:%ui eof:%ud",
+                          u, u ? u->peer.connection : NULL, u ? u->ft_type : 0,
+                          u ? u->eof : 0);
+        }
 
         lua_pushnil(L);
         lua_pushliteral(L, "closed");
         return 2;
     }
 
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+
     if (u->is_downstream) {
         return luaL_error(L, "attempt to write to request sockets");
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket send timeout: %M", u->send_timeout);
+                   "lua tcp socket send timeout: %M", u->send_timeout);
 
     type = lua_type(L, 2);
     switch (type) {
@@ -1446,7 +1625,7 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
             break;
 
         case LUA_TTABLE:
-            len = ngx_http_lua_calc_strlen_in_table(L, 2, 1 /* strict */);
+            len = ngx_http_lua_calc_strlen_in_table(L, 2, 2, 1 /* strict */);
             break;
 
         default:
@@ -1478,7 +1657,7 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
             break;
 
         case LUA_TTABLE:
-            b->last = ngx_http_lua_copy_str_in_table(L, b->last);
+            b->last = ngx_http_lua_copy_str_in_table(L, -1, b->last);
             break;
 
         default:
@@ -1488,29 +1667,16 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
     u->request_bufs = cl;
 
     u->request_len = len;
-    u->request_sent = 0;
     u->ft_type = 0;
 
     /* mimic ngx_http_upstream_init_request here */
 
-    if (u->output.pool == NULL) {
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-        u->output.alignment = clcf->directio_alignment;
-        u->output.pool = r->pool;
-        u->output.bufs.num = 1;
-        u->output.bufs.size = clcf->client_body_buffer_size;
-        u->output.output_filter = ngx_chain_writer;
-        u->output.filter_ctx = &u->writer;
-        u->output.tag = (ngx_buf_tag_t) &ngx_http_lua_module;
-
-        u->writer.pool = r->pool;
-    }
-
 #if 1
     u->waiting = 0;
 #endif
 
+    ngx_http_lua_probe_socket_tcp_send_start(r, u, b->pos, len);
+
     rc = ngx_http_lua_socket_send(r, u);
 
     dd("socket send returned %d", (int) rc);
@@ -1526,19 +1692,21 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
 
     /* rc == NGX_AGAIN */
 
+    ctx->cur_co_ctx->cleanup = ngx_http_lua_tcp_socket_cleanup;
+
     if (ctx->entered_content_phase) {
         r->write_event_handler = ngx_http_lua_content_wev_handler;
     }
 
+    u->co_ctx = ctx->cur_co_ctx;
     u->waiting = 1;
-
-    ctx->data = u;
     u->prepare_retvals = ngx_http_lua_socket_tcp_send_retval_handler;
 
-    dd("setting socket_ready to 0");
+    dd("setting data to %p", u);
 
-    ctx->socket_busy = 1;
-    ctx->socket_ready = 0;
+    coctx = ctx->cur_co_ctx;
+
+    coctx->data = u;
 
     return lua_yield(L, 0);
 }
@@ -1546,10 +1714,10 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
 
 static int
 ngx_http_lua_socket_tcp_send_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L)
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
 {
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket send return value handler");
+                   "lua tcp socket send return value handler");
 
     if (u->ft_type) {
         return ngx_http_lua_socket_error_retval_handler(r, u, L);
@@ -1562,17 +1730,47 @@ ngx_http_lua_socket_tcp_send_retval_handler(ngx_http_request_t *r,
 
 static int
 ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, lua_State *L)
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
 {
     int                          n;
     ngx_int_t                    rc;
     ngx_http_lua_ctx_t          *ctx;
+    ngx_event_t                 *ev;
+
+    ngx_http_lua_loc_conf_t             *llcf;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket receive return value handler");
+                   "lua tcp socket receive return value handler");
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
+#if 1
+    if (u->is_downstream) {
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->check_client_abort) {
+
+            r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
+
+            ev = r->connection->read;
+
+            dd("rev active: %d", ev->active);
+
+            if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && !ev->active) {
+                if (ngx_add_event(ev, NGX_READ_EVENT, 0) != NGX_OK) {
+                    lua_pushnil(L);
+                    lua_pushliteral(L, "failed to add event");
+                    return 2;
+                }
+            }
+
+        } else {
+            /* llcf->check_client_abort == 0 */
+            r->read_event_handler = ngx_http_block_reading;
+        }
+    }
+#endif
+
     if (u->ft_type) {
 
         dd("u->bufs_in: %p", u->bufs_in);
@@ -1612,18 +1810,19 @@ static int
 ngx_http_lua_socket_tcp_close(lua_State *L)
 {
     ngx_http_request_t                  *r;
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
 
     if (lua_gettop(L) != 1) {
-        return luaL_error(L, "ngx.socket close: expecting 1 argument "
+        return luaL_error(L, "expecting 1 argument "
                           "(including the object) but seen %d", lua_gettop(L));
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    /* luaL_checktype(L, 1, LUA_TTABLE); */
+    luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
@@ -1635,11 +1834,19 @@ ngx_http_lua_socket_tcp_close(lua_State *L)
         return 2;
     }
 
-    if (u->is_downstream) {
-        return luaL_error(L, "attempt to close a request socket");
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
     }
 
-    ngx_http_lua_socket_finalize(r, u);
+    if (u->is_downstream) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "attempt to close a request socket");
+        return 2;
+    }
+
+    ngx_http_lua_socket_tcp_finalize(r, u);
 
     lua_pushinteger(L, 1);
     return 1;
@@ -1660,7 +1867,7 @@ ngx_http_lua_socket_tcp_settimeout(lua_State *L)
     int                     n;
     ngx_int_t               timeout;
 
-    ngx_http_lua_socket_upstream_t  *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
 
     n = lua_gettop(L);
 
@@ -1700,7 +1907,8 @@ ngx_http_lua_socket_tcp_handler(ngx_event_t *ev)
     ngx_connection_t                *c;
     ngx_http_request_t              *r;
     ngx_http_log_ctx_t              *ctx;
-    ngx_http_lua_socket_upstream_t  *u;
+
+    ngx_http_lua_socket_tcp_upstream_t  *u;
 
     c = ev->data;
     u = c->data;
@@ -1711,7 +1919,7 @@ ngx_http_lua_socket_tcp_handler(ngx_event_t *ev)
     ctx->current_request = r;
 
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket handler for \"%V?%V\", wev %d", &r->uri,
+                   "lua tcp socket handler for \"%V?%V\", wev %d", &r->uri,
                    &r->args, (int) ev->write);
 
     if (ev->write) {
@@ -1735,18 +1943,23 @@ ngx_http_lua_socket_tcp_get_peer(ngx_peer_connection_t *pc, void *data)
 
 static void
 ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_connection_t            *c;
+    ngx_http_lua_loc_conf_t     *llcf;
 
     c = u->peer.connection;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket read handler");
+                   "lua tcp socket read handler");
 
     if (c->read->timedout) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "lua socket read timed out");
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "lua tcp socket read timed out");
+        }
 
         ngx_http_lua_socket_handle_error(r, u, NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
         return;
@@ -1759,25 +1972,30 @@ ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
 #endif
 
     if (u->buffer.start != NULL) {
-        (void) ngx_http_lua_socket_read(r, u);
+        (void) ngx_http_lua_socket_tcp_read(r, u);
     }
 }
 
 
 static void
 ngx_http_lua_socket_send_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_connection_t            *c;
+    ngx_http_lua_loc_conf_t     *llcf;
 
     c = u->peer.connection;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket send handler");
+                   "lua tcp socket send handler");
 
     if (c->write->timedout) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "lua socket write timed out");
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "lua tcp socket write timed out");
+        }
 
         ngx_http_lua_socket_handle_error(r, u, NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
         return;
@@ -1791,84 +2009,98 @@ ngx_http_lua_socket_send_handler(ngx_http_request_t *r,
 
 static ngx_int_t
 ngx_http_lua_socket_send(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
-    ngx_int_t                    rc;
+    ngx_int_t                    n;
     ngx_connection_t            *c;
     ngx_http_lua_ctx_t          *ctx;
+    ngx_buf_t                   *b;
 
     c = u->peer.connection;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket send data");
+                   "lua tcp socket send data");
 
     dd("lua connection log: %p", c->log);
 
-    rc = ngx_output_chain(&u->output, u->request_sent ? NULL : u->request_bufs);
+    b = u->request_bufs->buf;
 
-    dd("output chain returned: %d", (int) rc);
+    for (;;) {
+        n = c->send(c, b->pos, b->last - b->pos);
 
-    u->request_sent = 1;
+        if (n >= 0) {
+            b->pos += n;
 
-    if (rc == NGX_ERROR) {
-        ngx_http_lua_socket_handle_error(r, u, NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return NGX_ERROR;
-    }
+            if (b->pos == b->last) {
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                               "lua tcp socket sent all the data");
 
-    if (c->write->timer_set) {
-        ngx_del_timer(c->write);
-    }
+                if (c->write->timer_set) {
+                    ngx_del_timer(c->write);
+                }
 
-    if (rc == NGX_AGAIN) {
-        u->write_event_handler = ngx_http_lua_socket_send_handler;
-        u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-
-        ngx_add_timer(c->write, u->send_timeout);
-
-        if (ngx_handle_write_event(c->write, u->conf->send_lowat) != NGX_OK) {
-            ngx_http_lua_socket_handle_error(r, u,
-                         NGX_HTTP_LUA_SOCKET_FT_ERROR);
-            return NGX_ERROR;
-        }
-
-        return NGX_AGAIN;
-    }
-
-    /* rc == NGX_OK */
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-            "lua socket sent all the data: buffered 0x%d", (int) c->buffered);
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        ngx_http_lua_socket_handle_error(r, u, NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return NGX_ERROR;
-    }
+                ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+                if (ctx == NULL) {
+                    ngx_http_lua_socket_handle_error(r, u,
+                                                 NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                    return NGX_ERROR;
+                }
 
 #if defined(nginx_version) && nginx_version >= 1001004
-    ngx_chain_update_chains(r->pool,
+                ngx_chain_update_chains(r->pool,
 #else
-    ngx_chain_update_chains(
+                ngx_chain_update_chains(
 #endif
-                            &ctx->free_bufs, &ctx->busy_bufs, &u->request_bufs,
-                            (ngx_buf_tag_t) &ngx_http_lua_module);
+                                        &ctx->free_bufs, &ctx->busy_bufs,
+                                        &u->request_bufs,
+                                        (ngx_buf_tag_t) &ngx_http_lua_module);
 
-    u->request_sent = 0;
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
+                u->write_event_handler = ngx_http_lua_socket_dummy_handler;
 
-    if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+                if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+                    ngx_http_lua_socket_handle_error(r, u,
+                                                 NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                    return NGX_ERROR;
+                }
+
+                ngx_http_lua_socket_handle_success(r, u);
+                return NGX_OK;
+            }
+
+            /* keep sending more data */
+            continue;
+        }
+
+        /* NGX_ERROR || NGX_AGAIN */
+        break;
+    }
+
+    if (n == NGX_ERROR) {
+        u->socket_errno = ngx_socket_errno;
         ngx_http_lua_socket_handle_error(r, u, NGX_HTTP_LUA_SOCKET_FT_ERROR);
         return NGX_ERROR;
     }
 
-    ngx_http_lua_socket_handle_success(r, u);
-    return NGX_OK;
+    /* n == NGX_AGAIN */
+
+    u->write_event_handler = ngx_http_lua_socket_send_handler;
+    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
+
+    ngx_add_timer(c->write, u->send_timeout);
+
+    if (ngx_handle_write_event(c->write, u->conf->send_lowat) != NGX_OK) {
+        ngx_http_lua_socket_handle_error(r, u,
+                     NGX_HTTP_LUA_SOCKET_FT_ERROR);
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
 }
 
 
 static void
 ngx_http_lua_socket_handle_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_http_lua_ctx_t          *ctx;
 
@@ -1877,9 +2109,13 @@ ngx_http_lua_socket_handle_success(ngx_http_request_t *r,
     u->write_event_handler = ngx_http_lua_socket_dummy_handler;
 #endif
 
+    if (u->co_ctx) {
+        u->co_ctx->cleanup = NULL;
+    }
+
 #if 0
     if (u->eof) {
-        ngx_http_lua_socket_finalize(r, u);
+        ngx_http_lua_socket_tcp_finalize(r, u);
     }
 #endif
 
@@ -1887,70 +2123,80 @@ ngx_http_lua_socket_handle_success(ngx_http_request_t *r,
         u->waiting = 0;
 
         ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+        if (ctx == NULL) {
+            return;
+        }
 
-        dd("setting socket_ready to 1");
-
-        ctx->socket_busy = 0;
-        ctx->socket_ready = 1;
+        ctx->resume_handler = ngx_http_lua_socket_tcp_resume;
+        ctx->cur_co_ctx = u->co_ctx;
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket waking up the current request");
+                       "lua tcp socket waking up the current request");
 
-        ngx_http_post_request(r, NULL);
+        r->write_event_handler(r);
     }
 }
 
 
 static void
 ngx_http_lua_socket_handle_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, ngx_uint_t ft_type)
+    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type)
 {
     ngx_http_lua_ctx_t          *ctx;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket handle error");
+                   "lua tcp socket handle error");
 
     u->ft_type |= ft_type;
 
 #if 0
-    ngx_http_lua_socket_finalize(r, u);
+    ngx_http_lua_socket_tcp_finalize(r, u);
 #endif
 
+    if (u->co_ctx) {
+        u->co_ctx->cleanup = NULL;
+    }
+
+    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
+    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
+
     if (u->waiting) {
         u->waiting = 0;
 
         ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+        if (ctx == NULL) {
+            return;
+        }
 
-        dd("setting socket_ready to 1");
-
-        ctx->socket_busy = 0;
-        ctx->socket_ready = 1;
+        ctx->resume_handler = ngx_http_lua_socket_tcp_resume;
+        ctx->cur_co_ctx = u->co_ctx;
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket waking up the current request");
+                       "lua tcp socket waking up the current request");
 
-        ngx_http_post_request(r, NULL);
+        r->write_event_handler(r);
     }
-
-    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
 }
 
 
 static void
 ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
-    ngx_http_lua_ctx_t          *ctx;
     ngx_int_t                    rc;
     ngx_connection_t            *c;
+    ngx_http_lua_loc_conf_t     *llcf;
 
     c = u->peer.connection;
 
     if (c->write->timedout) {
 
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "lua socket connect timed out");
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "lua tcp socket connect timed out");
+        }
 
         ngx_http_lua_socket_handle_error(r, u, NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
         return;
@@ -1971,7 +2217,7 @@ ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket connected");
+                   "lua tcp socket connected");
 
     /* We should delete the current write/read event
      * here because the socket object may not be used immediately
@@ -1988,42 +2234,29 @@ ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
         return;
     }
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    dd("setting socket_ready to 1");
-
-    ctx->socket_busy = 0;
-    ctx->socket_ready = 1;
-
-    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket waking up the current request");
-
-    ngx_http_post_request(r, NULL);
+    ngx_http_lua_socket_handle_success(r, u);
 }
 
 
 static void
-ngx_http_lua_socket_cleanup(void *data)
+ngx_http_lua_socket_tcp_cleanup(void *data)
 {
-    ngx_http_lua_socket_upstream_t  *u = data;
+    ngx_http_lua_socket_tcp_upstream_t  *u = data;
 
     ngx_http_request_t  *r;
 
     r = u->request;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "cleanup lua socket upstream request: \"%V\"", &r->uri);
+                   "cleanup lua tcp socket upstream request: \"%V\"", &r->uri);
 
-    ngx_http_lua_socket_finalize(r, u);
+    ngx_http_lua_socket_tcp_finalize(r, u);
 }
 
 
 static void
-ngx_http_lua_socket_finalize(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_http_lua_socket_pool_t          *spool;
     ngx_chain_t                         *cl;
@@ -2059,7 +2292,10 @@ ngx_http_lua_socket_finalize(ngx_http_request_t *r,
     }
 
     if (u->is_downstream) {
-        r->read_event_handler = ngx_http_block_reading;
+        if (r->connection->read->timer_set) {
+            ngx_del_timer(r->connection->read);
+        }
+
         u->peer.connection = NULL;
         return;
     }
@@ -2101,16 +2337,32 @@ ngx_http_lua_socket_finalize(ngx_http_request_t *r,
 static ngx_int_t
 ngx_http_lua_socket_test_connect(ngx_connection_t *c)
 {
-    int        err;
-    socklen_t  len;
+    int              err;
+    socklen_t        len;
 
 #if (NGX_HAVE_KQUEUE)
 
+    ngx_event_t     *ev;
+
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT)  {
+        dd("pending eof: (%p)%d (%p)%d", c->write, c->write->pending_eof,
+            c->read, c->read->pending_eof);
+
         if (c->write->pending_eof) {
-            (void) ngx_connection_error(c, c->write->kq_errno,
-                                    "kevent() reported that connect() failed");
-            return NGX_ERROR;
+            ev = c->write;
+
+        } else if (c->read->pending_eof) {
+            ev = c->read;
+
+        } else {
+            ev = NULL;
+        }
+
+        if (ev) {
+            (void) ngx_connection_error(c, ev->kq_errno,
+                                        "kevent() reported that connect() "
+                                        "failed");
+            return ev->kq_errno;
         }
 
     } else
@@ -2142,10 +2394,10 @@ ngx_http_lua_socket_test_connect(ngx_connection_t *c)
 
 static void
 ngx_http_lua_socket_dummy_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket dummy handler");
+                   "lua tcp socket dummy handler");
 }
 
 
@@ -2157,23 +2409,52 @@ ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
     ngx_str_t                            pat;
     ngx_int_t                            rc;
     size_t                               size;
+    unsigned                             inclusive = 0;
 
     ngx_http_lua_socket_compiled_pattern_t     *cp;
 
     n = lua_gettop(L);
-    if (n != 2) {
-        return luaL_error(L, "expecting 2 arguments "
+    if (n != 2 && n != 3) {
+        return luaL_error(L, "expecting 2 or 3 arguments "
                           "(including the object), but got %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    if (n == 3) {
+        /* check out the options table */
+
+        luaL_checktype(L, 3, LUA_TTABLE);
+
+        lua_getfield(L, 3, "inclusive");
+
+        switch (lua_type(L, -1)) {
+            case LUA_TNIL:
+                /* do nothing */
+                break;
+
+            case LUA_TBOOLEAN:
+                if (lua_toboolean(L, -1)) {
+                    inclusive = 1;
+                }
+                break;
+
+            default:
+                return luaL_error(L, "bad \"inclusive\" option value type: %s",
+                                  luaL_typename(L, -1));
+
+        }
+
+        lua_pop(L, 2);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket calling receiveuntil() method");
+                   "lua tcp socket calling receiveuntil() method");
 
-    /* luaL_checktype(L, 1, LUA_TTABLE); */
+    luaL_checktype(L, 1, LUA_TTABLE);
 
     pat.data = (u_char *) luaL_checklstring(L, 2, &pat.len);
     if (pat.len == 0) {
@@ -2196,6 +2477,8 @@ ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
 
     ngx_memzero(cp, size);
 
+    cp->inclusive = inclusive;
+
     rc = ngx_http_lua_socket_compile_pattern(pat.data, pat.len, cp,
                                              r->connection->log);
 
@@ -2214,11 +2497,12 @@ static int
 ngx_http_lua_socket_receiveuntil_iterator(lua_State *L)
 {
     ngx_http_request_t                  *r;
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_int_t                            rc;
     ngx_http_lua_ctx_t                  *ctx;
     lua_Integer                          bytes;
     int                                  n;
+    ngx_http_lua_co_ctx_t               *coctx;
 
     ngx_http_lua_socket_compiled_pattern_t     *cp;
 
@@ -2248,13 +2532,19 @@ ngx_http_lua_socket_receiveuntil_iterator(lua_State *L)
         return 2;
     }
 
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+
     r = u->request;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket receiveuntil iterator");
+                   "lua tcp socket receiveuntil iterator");
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket read timeout: %M", u->read_timeout);
+                   "lua tcp socket read timeout: %M", u->read_timeout);
 
     u->input_filter = ngx_http_lua_socket_read_until;
 
@@ -2300,9 +2590,13 @@ ngx_http_lua_socket_receiveuntil_iterator(lua_State *L)
     u->length = (size_t) bytes;
     u->rest = u->length;
 
+    if (u->is_downstream) {
+        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    }
+
     u->waiting = 0;
 
-    rc = ngx_http_lua_socket_read(r, u);
+    rc = ngx_http_lua_socket_tcp_read(r, u);
 
     if (rc == NGX_ERROR) {
         dd("read failed: %d", (int) u->ft_type);
@@ -2314,7 +2608,7 @@ ngx_http_lua_socket_receiveuntil_iterator(lua_State *L)
     if (rc == NGX_OK) {
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket receive done in a single run");
+                       "lua tcp socket receive done in a single run");
 
         return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
     }
@@ -2324,19 +2618,25 @@ ngx_http_lua_socket_receiveuntil_iterator(lua_State *L)
     u->read_event_handler = ngx_http_lua_socket_read_handler;
     u->write_event_handler = ngx_http_lua_socket_dummy_handler;
 
+    ctx->cur_co_ctx->cleanup = ngx_http_lua_tcp_socket_cleanup;
+
     if (ctx->entered_content_phase) {
         r->write_event_handler = ngx_http_lua_content_wev_handler;
     }
 
+    u->co_ctx = ctx->cur_co_ctx;
     u->waiting = 1;
-
-    ctx->data = u;
     u->prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
 
-    dd("setting socket_ready to 0");
+    coctx = ctx->cur_co_ctx;
 
-    ctx->socket_busy = 1;
-    ctx->socket_ready = 0;
+    dd("setting data to %p", u);
+
+    coctx->data = u;
+
+    if (u->is_downstream) {
+        ctx->req_body_reader_co_ctx = coctx;
+    }
 
     return lua_yield(L, 0);
 }
@@ -2411,8 +2711,8 @@ ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
 
                 if (!found) {
                     ngx_log_debug7(NGX_LOG_DEBUG_HTTP, log, 0,
-                                   "lua socket read until recovering point: "
-                                   "on state %d (%*s), if next is '%c', then "
+                                   "lua tcp socket read until recovering point:"
+                                   " on state %d (%*s), if next is '%c', then "
                                    "recover to state %d (%*s)", cur_state,
                                    (size_t) cur_state, data, data[prefix_len],
                                    new_state, (size_t) new_state, data);
@@ -2441,14 +2741,16 @@ ngx_http_lua_socket_read_until(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_compiled_pattern_t     *cp = data;
 
-    ngx_http_lua_socket_upstream_t          *u;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
     ngx_http_request_t                      *r;
     ngx_buf_t                               *b;
     u_char                                   c;
     u_char                                  *pat;
     size_t                                   pat_len;
     int                                      i;
-    int                                      state, old_state;
+    int                                      state;
+    int                                      old_state = 0; /* just to make old
+                                                               gcc happy */
     ngx_http_lua_dfa_edge_t                 *edge;
     unsigned                                 matched;
     ngx_int_t                                rc;
@@ -2457,7 +2759,7 @@ ngx_http_lua_socket_read_until(void *data, ssize_t bytes)
     r = u->request;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket read until");
+                   "lua tcp socket read until");
 
     if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
@@ -2493,6 +2795,17 @@ ngx_http_lua_socket_read_until(void *data, ssize_t bytes)
                     cp->state = 0;
                 }
 
+                if (cp->inclusive) {
+                    rc = ngx_http_lua_socket_add_pending_data(r, u, b->pos, 0,
+                                                              pat, state,
+                                                              state);
+
+                    if (rc != NGX_OK) {
+                        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
+                        return NGX_ERROR;
+                    }
+                }
+
                 return NGX_OK;
             }
 
@@ -2630,6 +2943,11 @@ ngx_http_lua_socket_cleanup_compiled_pattern(lua_State *L)
         }
     }
 
+#if 1
+    ngx_free(cp->recovering);
+    cp->recovering = NULL;
+#endif
+
     return 0;
 }
 
@@ -2641,28 +2959,46 @@ ngx_http_lua_req_socket(lua_State *L)
     ngx_http_lua_loc_conf_t         *llcf;
     ngx_connection_t                *c;
     ngx_http_request_t              *r;
-    ngx_http_lua_socket_upstream_t  *u;
     ngx_http_lua_ctx_t              *ctx;
     ngx_http_request_body_t         *rb;
     ngx_http_cleanup_t              *cln;
+    ngx_http_lua_co_ctx_t           *coctx;
+
+    ngx_http_lua_socket_tcp_upstream_t  *u;
 
     if (lua_gettop(L) != 0) {
         return luaL_error(L, "expecting zero arguments, but got %d",
                 lua_gettop(L));
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (r->discard_body) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "request body discarded"); return 2;
+    if (r != r->main) {
+        return luaL_error(L, "attempt to read the request body in a "
+                          "subrequest");
     }
 
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
     if (r->request_body) {
         lua_pushnil(L);
-        lua_pushliteral(L, "request body already read");
+        lua_pushliteral(L, "request body already exists");
+        return 2;
+    }
+
+    if (r->discard_body) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "request body discarded");
         return 2;
     }
 
@@ -2691,13 +3027,11 @@ ngx_http_lua_req_socket(lua_State *L)
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */); /* the object */
 
-    lua_getglobal(L, "ngx");
-    lua_getfield(L, -1, "_reqsock_meta");
+    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, -2);
 
-    lua_setmetatable(L, -3);
-    lua_pop(L, 1);
-
-    u = lua_newuserdata(L, sizeof(ngx_http_lua_socket_upstream_t));
+    u = lua_newuserdata(L, sizeof(ngx_http_lua_socket_tcp_upstream_t));
     if (u == NULL) {
         return luaL_error(L, "out of memory");
     }
@@ -2711,10 +3045,12 @@ ngx_http_lua_req_socket(lua_State *L)
 
     lua_rawseti(L, 1, SOCKET_CTX_INDEX);
 
-    ngx_memzero(u, sizeof(ngx_http_lua_socket_upstream_t));
+    ngx_memzero(u, sizeof(ngx_http_lua_socket_tcp_upstream_t));
 
     u->is_downstream = 1;
 
+    coctx = ctx->cur_co_ctx;
+
     u->request = r;
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
@@ -2745,11 +3081,10 @@ ngx_http_lua_req_socket(lua_State *L)
     c = r->connection;
     pc->connection = c;
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    dd("setting data to %p", u);
 
-    ctx->data = u;
-
-    r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    coctx->data = u;
+    ctx->req_body_reader_co_ctx = coctx;
 
     if (c->read->timer_set) {
         ngx_del_timer(c->read);
@@ -2764,8 +3099,9 @@ ngx_http_lua_req_socket(lua_State *L)
 static void
 ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r)
 {
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_http_lua_socket_upstream_t  *u;
+    ngx_http_lua_ctx_t                  *ctx;
+    ngx_http_lua_co_ctx_t               *coctx;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua request socket read event handler");
@@ -2775,7 +3111,8 @@ ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r)
         return;
     }
 
-    u = ctx->data;
+    coctx = ctx->req_body_reader_co_ctx;
+    u = coctx->data;
 
     if (u) {
         u->read_event_handler(r, u);
@@ -2786,14 +3123,14 @@ ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r)
 static int
 ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L)
 {
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t    *u;
 
     if (lua_gettop(L) != 1) {
         return luaL_error(L, "expecting 1 argument "
                           "(including the object), but got %d", lua_gettop(L));
     }
 
-    /* luaL_checktype(L, 1, LUA_TTABLE); */
+    luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
@@ -2813,7 +3150,7 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 {
     ngx_http_lua_main_conf_t            *lmcf;
     ngx_http_lua_loc_conf_t             *llcf;
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
     size_t                               size;
@@ -2838,9 +3175,10 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
                           "(including the object), but got %d", n);
     }
 
-    /* luaL_checktype(L, 1, LUA_TTABLE); */
+    luaL_checktype(L, 1, LUA_TTABLE);
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_SOCKET_POOL);
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
 
     lua_rawgeti(L, 1, SOCKET_KEY_INDEX);
     key.data = (u_char *) lua_tolstring(L, -1, &key.len);
@@ -2865,9 +3203,23 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
     b = &u->buffer;
 
     if (b->start && ngx_buf_size(b)) {
+        ngx_http_lua_probe_socket_tcp_setkeepalive_buf_unread(r, u, b->pos,
+                                                              b->last - b->pos);
+
         lua_pushnil(L);
         lua_pushliteral(L, "unread data in buffer");
         return 2;
@@ -2891,7 +3243,7 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua socket set keepalive: saving connection %p", c);
+                   "lua tcp socket set keepalive: saving connection %p", c);
 
     dd("saving connection to key %s", lua_tostring(L, -1));
 
@@ -2902,10 +3254,6 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 
     /* stack: obj timeout? size? cache key */
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (spool == NULL) {
@@ -2925,7 +3273,7 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         }
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket connection pool size: %ui", pool_size);
+                       "lua tcp socket connection pool size: %ui", pool_size);
 
         size = sizeof(ngx_http_lua_socket_pool_t) + key.len
                 + sizeof(ngx_http_lua_socket_pool_item_t)
@@ -2937,8 +3285,8 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         }
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua socket keepalive create connection pool for key "
-                       "\"%s\"", lua_tostring(L, -2));
+                       "lua tcp socket keepalive create connection pool for key"
+                       " \"%s\"", lua_tostring(L, -2));
 
         lua_rawset(L, -3);
 
@@ -2986,7 +3334,7 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua socket clear current socket connection");
+                   "lua tcp socket clear current socket connection");
 
     pc->connection = NULL;
 
@@ -3015,13 +3363,13 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 #if (NGX_DEBUG)
     if (timeout == 0) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket keepalive timeout: unlimited");
+                       "lua tcp socket keepalive timeout: unlimited");
     }
 #endif
 
     if (timeout) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua socket keepalive timeout: %M ms", timeout);
+                       "lua tcp socket keepalive timeout: %M ms", timeout);
 
         ngx_add_timer(c->read, timeout);
     }
@@ -3049,7 +3397,7 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     }
 
 #if 1
-    ngx_http_lua_socket_finalize(r, u);
+    ngx_http_lua_socket_tcp_finalize(r, u);
 #endif
 
     lua_pushinteger(L, 1);
@@ -3059,7 +3407,7 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 
 static ngx_int_t
 ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
-    int key_index, ngx_http_lua_socket_upstream_t *u)
+    int key_index, ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_http_lua_socket_pool_item_t     *item;
     ngx_http_lua_socket_pool_t          *spool;
@@ -3076,18 +3424,19 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua socket pool get keepalive peer");
+                   "lua tcp socket pool get keepalive peer");
 
     pc = &u->peer;
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_SOCKET_POOL); /* table */
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_rawget(L, LUA_REGISTRYINDEX); /* table */
     lua_pushvalue(L, key_index); /* key */
     lua_rawget(L, -2);
 
     spool = lua_touserdata(L, -1);
     if (spool == NULL) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua socket keepalive connection pool not found");
+                       "lua tcp socket keepalive connection pool not found");
         lua_settop(L, top);
         return NGX_DECLINED;
     }
@@ -3104,8 +3453,8 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
         ngx_queue_insert_head(&spool->free, q);
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua socket get keepalive peer: using connection %p, "
-                       "fd:%d", c, c->fd);
+                       "lua tcp socket get keepalive peer: using connection %p,"
+                       " fd:%d", c, c->fd);
 
         c->idle = 0;
         c->log = pc->log;
@@ -3127,12 +3476,6 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
 
         u->reused = item->reused + 1;
 
-        u->writer.out = NULL;
-        u->writer.last = &u->writer.out;
-        u->writer.connection = c;
-        u->writer.limit = 0;
-        u->request_sent = 0;
-
 #if 1
         u->write_event_handler = ngx_http_lua_socket_dummy_handler;
         u->read_event_handler = ngx_http_lua_socket_dummy_handler;
@@ -3146,7 +3489,7 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
                 return NGX_ERROR;
             }
 
-            cln->handler = ngx_http_lua_socket_cleanup;
+            cln->handler = ngx_http_lua_socket_tcp_cleanup;
             cln->data = u;
             u->cleanup = &cln->handler;
         }
@@ -3157,7 +3500,7 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua socket keepalive: connection pool empty");
+                   "lua tcp socket keepalive: connection pool empty");
 
     lua_settop(L, top);
 
@@ -3198,7 +3541,7 @@ ngx_http_lua_socket_keepalive_close_handler(ngx_event_t *ev)
 
     if (c->read->timedout) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                       "lua socket keepalive max idle timeout");
+                       "lua tcp socket keepalive max idle timeout");
 
         goto close;
     }
@@ -3206,7 +3549,7 @@ ngx_http_lua_socket_keepalive_close_handler(ngx_event_t *ev)
     dd("read event ready: %d", (int) c->read->ready);
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                   "lua socket keepalive close handler check stale events");
+                   "lua tcp socket keepalive close handler check stale events");
 
     n = recv(c->fd, buf, 1, MSG_PEEK);
 
@@ -3223,7 +3566,7 @@ ngx_http_lua_socket_keepalive_close_handler(ngx_event_t *ev)
 close:
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                   "lua socket keepalive close handler: fd:%d", c->fd);
+                   "lua tcp socket keepalive close handler: fd:%d", c->fd);
 
     item = c->data;
     spool = item->socket_pool;
@@ -3251,12 +3594,13 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
     lua_State                           *L;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "lua socket keepalive: free connection pool for \"%s\"",
+                   "lua tcp socket keepalive: free connection pool for \"%s\"",
                    spool->key);
 
     L = spool->conf->lua;
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_SOCKET_POOL);
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushstring(L, (char *) spool->key);
     lua_pushnil(L);
     lua_rawset(L, -3);
@@ -3265,9 +3609,9 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 
 
 static int
-ngx_http_lua_socket_upstream_destroy(lua_State *L)
+ngx_http_lua_socket_tcp_upstream_destroy(lua_State *L)
 {
-    ngx_http_lua_socket_upstream_t          *u;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
 
     dd("upstream destroy triggered by Lua GC");
 
@@ -3277,7 +3621,7 @@ ngx_http_lua_socket_upstream_destroy(lua_State *L)
     }
 
     if (u->cleanup) {
-        ngx_http_lua_socket_cleanup(u); /* it will clear u->cleanup */
+        ngx_http_lua_socket_tcp_cleanup(u); /* it will clear u->cleanup */
     }
 
     return 0;
@@ -3287,7 +3631,7 @@ ngx_http_lua_socket_upstream_destroy(lua_State *L)
 static int
 ngx_http_lua_socket_downstream_destroy(lua_State *L)
 {
-    ngx_http_lua_socket_upstream_t          *u;
+    ngx_http_lua_socket_tcp_upstream_t     *u;
 
     dd("upstream destroy triggered by Lua GC");
 
@@ -3307,7 +3651,7 @@ ngx_http_lua_socket_downstream_destroy(lua_State *L)
 static void
 ngx_http_lua_req_socket_cleanup(void *data)
 {
-    ngx_http_lua_socket_upstream_t  *u = data;
+    ngx_http_lua_socket_tcp_upstream_t  *u = data;
 
 #if (NGX_DEBUG)
     ngx_http_request_t  *r;
@@ -3315,7 +3659,8 @@ ngx_http_lua_req_socket_cleanup(void *data)
     r = u->request;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "cleanup lua socket downstream request: \"%V\"", &r->uri);
+                   "cleanup lua tcp socket downstream request: \"%V\"",
+                   &r->uri);
 #endif
 
     if (u->cleanup) {
@@ -3331,7 +3676,8 @@ ngx_http_lua_req_socket_cleanup(void *data)
 
 static ngx_int_t
 ngx_http_lua_socket_push_input_data(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_http_lua_socket_upstream_t *u, lua_State *L)
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_socket_tcp_upstream_t *u,
+    lua_State *L)
 {
     ngx_chain_t             *cl;
     ngx_chain_t            **ll;
@@ -3343,6 +3689,7 @@ ngx_http_lua_socket_push_input_data(ngx_http_request_t *r,
 
     if (!u->bufs_in) {
         lua_pushliteral(L, "");
+        ngx_http_lua_probe_socket_tcp_receive_done(r, u, (u_char *) "", 0);
         return NGX_OK;
     }
 
@@ -3368,15 +3715,20 @@ ngx_http_lua_socket_push_input_data(ngx_http_request_t *r,
     if (size == 0) {
         lua_pushliteral(L, "");
 
+        ngx_http_lua_probe_socket_tcp_receive_done(r, u, (u_char *) "", 0);
+
         goto done;
     }
 
     if (nbufs == 1) {
         b = u->buf_in->buf;
-        lua_pushlstring(L, (char *) b->pos, b->last - b->pos);
 
-        dd("copying input data chunk from %p: \"%.*s\"", u->buf_in,
-            (int) (b->last - b->pos), b->pos);
+        lua_pushlstring(L, (char *) b->pos, size);
+
+        dd("copying input data chunk from %p: \"%.*s\"", u->buf_in, (int) size,
+                b->pos);
+
+        ngx_http_lua_probe_socket_tcp_receive_done(r, u, b->pos, size);
 
         goto done;
     }
@@ -3401,6 +3753,8 @@ ngx_http_lua_socket_push_input_data(ngx_http_request_t *r,
 
     lua_pushlstring(L, (char *) p, size);
 
+    ngx_http_lua_probe_socket_tcp_receive_done(r, u, p, size);
+
     ngx_pfree(r->pool, p);
 
 done:
@@ -3427,7 +3781,7 @@ done:
 
 static ngx_int_t
 ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u)
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_chain_t             *cl;
     ngx_http_lua_ctx_t      *ctx;
@@ -3454,12 +3808,14 @@ ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
 
 static ngx_int_t
 ngx_http_lua_socket_add_pending_data(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, u_char *pos, size_t len, u_char *pat,
+    ngx_http_lua_socket_tcp_upstream_t *u, u_char *pos, size_t len, u_char *pat,
     int prefix, int old_state)
 {
     u_char          *last;
     ngx_buf_t       *b;
 
+    dd("resuming data: %d: [%.*s]", prefix, prefix, pat);
+
     last = &pos[len];
 
     b = u->buf_in->buf;
@@ -3469,7 +3825,8 @@ ngx_http_lua_socket_add_pending_data(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-    dd("resumed data: %d: [%.*s]", prefix, prefix, pat);
+    dd("need more buffers because %d != %d", (int) (last - b->last),
+       (int) old_state);
 
     if (ngx_http_lua_socket_insert_buffer(r, u, pat, prefix) != NGX_OK) {
         return NGX_ERROR;
@@ -3483,7 +3840,7 @@ ngx_http_lua_socket_add_pending_data(ngx_http_request_t *r,
 
 
 static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u, u_char *pat, size_t prefix)
+    ngx_http_lua_socket_tcp_upstream_t *u, u_char *pat, size_t prefix)
 {
     ngx_chain_t             *cl, *new_cl, **ll;
     ngx_http_lua_ctx_t      *ctx;
@@ -3544,43 +3901,109 @@ static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
 
 
 static ngx_int_t
-ngx_http_lua_test_expect(ngx_http_request_t *r)
+ngx_http_lua_socket_tcp_resume(ngx_http_request_t *r)
 {
-    ngx_int_t   n;
-    ngx_str_t  *expect;
+    int                          nret;
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
+    ngx_http_lua_main_conf_t    *lmcf;
 
-    if (r->expect_tested
-        || r->headers_in.expect == NULL
-        || r->http_version < NGX_HTTP_VERSION_11)
-    {
-        return NGX_OK;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
     }
 
-    r->expect_tested = 1;
+    ctx->resume_handler = ngx_http_lua_wev_handler;
 
-    expect = &r->headers_in.expect->value;
-
-    if (expect->len != sizeof("100-continue") - 1
-        || ngx_strncasecmp(expect->data, (u_char *) "100-continue",
-                           sizeof("100-continue") - 1)
-           != 0)
-    {
-        return NGX_OK;
-    }
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "send 100 Continue");
+                   "lua tcp operation done, resuming lua thread");
 
-    n = r->connection->send(r->connection,
-                            (u_char *) "HTTP/1.1 100 Continue" CRLF CRLF,
-                            sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1);
+    coctx = ctx->cur_co_ctx;
 
-    if (n == sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1) {
-        return NGX_OK;
+#if 0
+    ngx_http_lua_probe_info("tcp resume");
+#endif
+
+    dd("coctx: %p", coctx);
+
+    u = coctx->data;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket calling prepare retvals handler %p, "
+                   "u:%p", u->prepare_retvals, u);
+
+    nret = u->prepare_retvals(r, u, ctx->cur_co_ctx->co);
+    if (nret == NGX_AGAIN) {
+        return NGX_DONE;
     }
 
-    /* we assume that such small packet should be send successfully */
+    c = r->connection;
 
-    return NGX_ERROR;
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, nret);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c,lmcf->lua, r, ctx);
+    }
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_tcp_resolve_cleanup(void *data)
+{
+    ngx_resolver_ctx_t                      *rctx;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+    ngx_http_lua_co_ctx_t                   *coctx = data;
+
+    u = coctx->data;
+    if (u == NULL) {
+        return;
+    }
+
+    rctx = u->resolved->ctx;
+    if (rctx == NULL) {
+        return;
+    }
+
+    ngx_resolve_name_done(rctx);
+}
+
+
+static void
+ngx_http_lua_tcp_socket_cleanup(void *data)
+{
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+    ngx_http_lua_co_ctx_t                   *coctx = data;
+
+    u = coctx->data;
+    if (u == NULL) {
+        return;
+    }
+
+    if (u->request == NULL) {
+        return;
+    }
+
+    ngx_http_lua_socket_tcp_finalize(u->request, u);
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket.h b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
similarity index 64%
rename from debian/modules/nginx-lua/src/ngx_http_lua_socket.h
rename to debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
index 127ca50..ab30c8b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
@@ -1,19 +1,31 @@
-#ifndef NGX_HTTP_LUA_SOCKET_H
-#define NGX_HTTP_LUA_SOCKET_H
+#ifndef NGX_HTTP_LUA_SOCKET_TCP_H
+#define NGX_HTTP_LUA_SOCKET_TCP_H
 
 
 #include "ngx_http_lua_common.h"
 
-typedef struct ngx_http_lua_socket_upstream_s  ngx_http_lua_socket_upstream_t;
+
+#define NGX_HTTP_LUA_SOCKET_FT_ERROR         0x0001
+#define NGX_HTTP_LUA_SOCKET_FT_TIMEOUT       0x0002
+#define NGX_HTTP_LUA_SOCKET_FT_CLOSED        0x0004
+#define NGX_HTTP_LUA_SOCKET_FT_RESOLVER      0x0008
+#define NGX_HTTP_LUA_SOCKET_FT_BUFTOOSMALL   0x0010
+#define NGX_HTTP_LUA_SOCKET_FT_NOMEM         0x0020
+#define NGX_HTTP_LUA_SOCKET_FT_PARTIALWRITE  0x0040
+#define NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT   0x0080
+
+
+typedef struct ngx_http_lua_socket_tcp_upstream_s
+        ngx_http_lua_socket_tcp_upstream_t;
 
 
 typedef
-    int (*ngx_http_lua_socket_retval_handler)(ngx_http_request_t *r,
-        ngx_http_lua_socket_upstream_t *u, lua_State *L);
+    int (*ngx_http_lua_socket_tcp_retval_handler)(ngx_http_request_t *r,
+        ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 
 
-typedef void (*ngx_http_lua_socket_upstream_handler_pt)(ngx_http_request_t *r,
-    ngx_http_lua_socket_upstream_t *u);
+typedef void (*ngx_http_lua_socket_tcp_upstream_handler_pt)(
+          ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u);
 
 
 typedef struct {
@@ -29,10 +41,10 @@ typedef struct {
 } ngx_http_lua_socket_pool_t;
 
 
-struct ngx_http_lua_socket_upstream_s {
-    ngx_http_lua_socket_retval_handler          prepare_retvals;
-    ngx_http_lua_socket_upstream_handler_pt     read_event_handler;
-    ngx_http_lua_socket_upstream_handler_pt     write_event_handler;
+struct ngx_http_lua_socket_tcp_upstream_s {
+    ngx_http_lua_socket_tcp_retval_handler          prepare_retvals;
+    ngx_http_lua_socket_tcp_upstream_handler_pt     read_event_handler;
+    ngx_http_lua_socket_tcp_upstream_handler_pt     write_event_handler;
 
     ngx_http_lua_socket_pool_t      *socket_pool;
 
@@ -57,19 +69,15 @@ struct ngx_http_lua_socket_upstream_s {
     ngx_uint_t                       ft_type;
     ngx_err_t                        socket_errno;
 
-    ngx_output_chain_ctx_t           output;
-    ngx_chain_writer_ctx_t           writer;
-
     ngx_int_t                      (*input_filter)(void *data, ssize_t bytes);
     void                            *input_filter_ctx;
 
-    ssize_t                          recv_bytes;
     size_t                           request_len;
     ngx_chain_t                     *request_bufs;
 
-    ngx_uint_t                       reused;
+    ngx_http_lua_co_ctx_t           *co_ctx;
 
-    unsigned                         request_sent:1;
+    ngx_uint_t                       reused;
 
     unsigned                         waiting:1;
     unsigned                         eof:1;
@@ -88,11 +96,13 @@ struct ngx_http_lua_dfa_edge_s {
 
 
 typedef struct {
-    ngx_http_lua_socket_upstream_t      *upstream;
+    ngx_http_lua_socket_tcp_upstream_t  *upstream;
 
     ngx_str_t                            pattern;
     int                                  state;
     ngx_http_lua_dfa_edge_t            **recovering;
+
+    unsigned                             inclusive:1;
 } ngx_http_lua_socket_compiled_pattern_t;
 
 
@@ -110,10 +120,10 @@ typedef struct {
 } ngx_http_lua_socket_pool_item_t;
 
 
-void ngx_http_lua_inject_socket_api(ngx_log_t *log, lua_State *L);
+void ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L);
 
 void ngx_http_lua_inject_req_socket_api(lua_State *L);
 
 
-#endif /* NGX_HTTP_LUA_SOCKET_H */
+#endif /* NGX_HTTP_LUA_SOCKET_TCP_H */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
new file mode 100644
index 0000000..c77f19a
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
@@ -0,0 +1,1486 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_socket_udp.h"
+#include "ngx_http_lua_socket_tcp.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_contentby.h"
+#include "ngx_http_lua_output.h"
+#include "ngx_http_lua_probe.h"
+
+
+#if 1
+#undef ngx_http_lua_probe_info
+#define ngx_http_lua_probe_info(msg)
+#endif
+
+
+#define UDP_MAX_DATAGRAM_SIZE 8192
+
+
+static int ngx_http_lua_socket_udp(lua_State *L);
+static int ngx_http_lua_socket_udp_setpeername(lua_State *L);
+static int ngx_http_lua_socket_udp_send(lua_State *L);
+static int ngx_http_lua_socket_udp_receive(lua_State *L);
+static int ngx_http_lua_socket_udp_settimeout(lua_State *L);
+static void ngx_http_lua_socket_udp_finalize(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u);
+static int ngx_http_lua_socket_udp_upstream_destroy(lua_State *L);
+static int ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, lua_State *L);
+static void ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx);
+static int ngx_http_lua_socket_error_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, lua_State *L);
+static void ngx_http_lua_socket_udp_handle_error(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, ngx_uint_t ft_type);
+static void ngx_http_lua_socket_udp_cleanup(void *data);
+static void ngx_http_lua_socket_udp_handler(ngx_event_t *ev);
+static void ngx_http_lua_socket_dummy_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u);
+static int ngx_http_lua_socket_udp_receive_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, lua_State *L);
+static ngx_int_t ngx_http_lua_socket_udp_read(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u);
+static void ngx_http_lua_socket_udp_read_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u);
+static void ngx_http_lua_socket_udp_handle_success(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u);
+static ngx_int_t ngx_http_lua_udp_connect(ngx_udp_connection_t *uc);
+static int ngx_http_lua_socket_udp_close(lua_State *L);
+static ngx_int_t ngx_http_lua_socket_udp_resume(ngx_http_request_t *r);
+static void ngx_http_lua_udp_resolve_cleanup(void *data);
+static void ngx_http_lua_udp_socket_cleanup(void *data);
+
+
+enum {
+    SOCKET_CTX_INDEX = 1,
+    SOCKET_TIMEOUT_INDEX = 2
+};
+
+
+static char ngx_http_lua_socket_udp_metatable_key;
+static u_char ngx_http_lua_socket_udp_buffer[UDP_MAX_DATAGRAM_SIZE];
+
+
+void
+ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
+{
+    lua_getfield(L, -1, "socket"); /* ngx socket */
+
+    lua_pushcfunction(L, ngx_http_lua_socket_udp);
+    lua_setfield(L, -2, "udp"); /* ngx socket */
+
+    /* udp socket object metatable */
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
+    lua_createtable(L, 0 /* narr */, 4 /* nrec */);
+
+    lua_pushcfunction(L, ngx_http_lua_socket_udp_setpeername);
+    lua_setfield(L, -2, "setpeername"); /* ngx socket mt */
+
+    lua_pushcfunction(L, ngx_http_lua_socket_udp_send);
+    lua_setfield(L, -2, "send");
+
+    lua_pushcfunction(L, ngx_http_lua_socket_udp_receive);
+    lua_setfield(L, -2, "receive");
+
+    lua_pushcfunction(L, ngx_http_lua_socket_udp_settimeout);
+    lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
+
+    lua_pushcfunction(L, ngx_http_lua_socket_udp_close);
+    lua_setfield(L, -2, "close"); /* ngx socket mt */
+
+    lua_pushvalue(L, -1);
+    lua_setfield(L, -2, "__index");
+    lua_rawset(L, LUA_REGISTRYINDEX);
+    /* }}} */
+
+    lua_pop(L, 1);
+}
+
+
+static int
+ngx_http_lua_socket_udp(lua_State *L)
+{
+    ngx_http_request_t      *r;
+    ngx_http_lua_ctx_t      *ctx;
+
+    if (lua_gettop(L) != 0) {
+        return luaL_error(L, "expecting zero arguments, but got %d",
+                          lua_gettop(L));
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    lua_createtable(L, 3 /* narr */, 1 /* nrec */);
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, -2);
+
+    dd("top: %d", lua_gettop(L));
+
+    return 1;
+}
+
+
+static int
+ngx_http_lua_socket_udp_setpeername(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_str_t                    host;
+    int                          port;
+    ngx_resolver_ctx_t          *rctx, temp;
+    ngx_http_core_loc_conf_t    *clcf;
+    int                          saved_top;
+    int                          n;
+    u_char                      *p;
+    size_t                       len;
+    ngx_url_t                    url;
+    ngx_int_t                    rc;
+    ngx_http_lua_loc_conf_t     *llcf;
+    ngx_udp_connection_t        *uc;
+    int                          timeout;
+    ngx_http_lua_co_ctx_t       *coctx;
+
+    ngx_http_lua_socket_udp_upstream_t      *u;
+
+    n = lua_gettop(L);
+    if (n != 2 && n != 3) {
+        return luaL_error(L, "ngx.socket.udp setpeername: expecting 2 or 3 "
+                          "arguments (including the object), but seen %d", n);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    p = (u_char *) luaL_checklstring(L, 2, &len);
+
+    host.data = ngx_palloc(r->pool, len + 1);
+    if (host.data == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    host.len = len;
+
+    ngx_memcpy(host.data, p, len);
+    host.data[len] = '\0';
+
+    if (n == 3) {
+        port = luaL_checkinteger(L, 3);
+
+        if (port < 0 || port > 65536) {
+            lua_pushnil(L);
+            lua_pushfstring(L, "bad port number: %d", port);
+            return 2;
+        }
+
+    } else { /* n == 2 */
+        port = 0;
+    }
+
+    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
+    u = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (u) {
+        if (u->waiting) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "socket busy");
+            return 2;
+        }
+
+        if (u->udp_connection.connection) {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua udp socket reconnect without shutting down");
+
+            ngx_http_lua_socket_udp_finalize(r, u);
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua reuse socket upstream ctx");
+
+    } else {
+        u = lua_newuserdata(L, sizeof(ngx_http_lua_socket_udp_upstream_t));
+        if (u == NULL) {
+            return luaL_error(L, "out of memory");
+        }
+
+#if 1
+        lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
+        lua_pushcfunction(L, ngx_http_lua_socket_udp_upstream_destroy);
+        lua_setfield(L, -2, "__gc");
+        lua_setmetatable(L, -2);
+#endif
+
+        lua_rawseti(L, 1, SOCKET_CTX_INDEX);
+    }
+
+    ngx_memzero(u, sizeof(ngx_http_lua_socket_udp_upstream_t));
+
+    u->request = r; /* set the controlling request */
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+    u->conf = llcf;
+
+    uc = &u->udp_connection;
+
+    uc->log = *r->connection->log;
+
+    dd("lua peer connection log: %p", &uc->log);
+
+    lua_rawgeti(L, 1, SOCKET_TIMEOUT_INDEX);
+    timeout = (ngx_int_t) lua_tointeger(L, -1);
+    lua_pop(L, 1);
+
+    if (timeout > 0) {
+        u->read_timeout = (ngx_msec_t) timeout;
+
+    } else {
+        u->read_timeout = u->conf->read_timeout;
+    }
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+
+    url.url.len = host.len;
+    url.url.data = host.data;
+    url.default_port = port;
+    url.no_resolve = 1;
+
+    if (ngx_parse_url(r->pool, &url) != NGX_OK) {
+        lua_pushnil(L);
+
+        if (url.err) {
+            lua_pushfstring(L, "failed to parse host name \"%s\": %s",
+                            host.data, url.err);
+
+        } else {
+            lua_pushfstring(L, "failed to parse host name \"%s\"", host.data);
+        }
+
+        return 2;
+    }
+
+    u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
+    if (u->resolved == NULL) {
+        return luaL_error(L, "out of memory");
+    }
+
+    if (url.addrs && url.addrs[0].sockaddr) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua udp socket network address given directly");
+
+        u->resolved->sockaddr = url.addrs[0].sockaddr;
+        u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->naddrs = 1;
+        u->resolved->host = url.addrs[0].name;
+
+    } else {
+        u->resolved->host = host;
+        u->resolved->port = (in_port_t) port;
+    }
+
+    if (u->resolved->sockaddr) {
+        rc = ngx_http_lua_socket_resolve_retval_handler(r, u, L);
+        if (rc == NGX_AGAIN) {
+            return lua_yield(L, 0);
+        }
+
+        return rc;
+    }
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    temp.name = host;
+    rctx = ngx_resolve_start(clcf->resolver, &temp);
+    if (rctx == NULL) {
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+        lua_pushnil(L);
+        lua_pushliteral(L, "failed to start the resolver");
+        return 2;
+    }
+
+    if (rctx == NGX_NO_RESOLVER) {
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+        lua_pushnil(L);
+        lua_pushfstring(L, "no resolver defined to resolve \"%s\"", host.data);
+        return 2;
+    }
+
+    rctx->name = host;
+    rctx->type = NGX_RESOLVE_A;
+    rctx->handler = ngx_http_lua_socket_resolve_handler;
+    rctx->data = u;
+    rctx->timeout = clcf->resolver_timeout;
+
+    u->co_ctx = ctx->cur_co_ctx;
+    u->resolved->ctx = rctx;
+
+    saved_top = lua_gettop(L);
+
+    coctx = ctx->cur_co_ctx;
+    coctx->cleanup = ngx_http_lua_udp_resolve_cleanup;
+
+    if (ngx_resolve_name(rctx) != NGX_OK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua udp socket fail to run resolver immediately");
+
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        u->resolved->ctx = NULL;
+        lua_pushnil(L);
+        lua_pushfstring(L, "%s could not be resolved", host.data);
+
+        return 2;
+    }
+
+    if (u->waiting == 1) {
+        /* resolved and already connecting */
+        return lua_yield(L, 0);
+    }
+
+    n = lua_gettop(L) - saved_top;
+    if (n) {
+        /* errors occurred during resolving or connecting
+         * or already connected */
+        return n;
+    }
+
+    /* still resolving */
+
+    u->waiting = 1;
+    u->prepare_retvals = ngx_http_lua_socket_resolve_retval_handler;
+
+    coctx->data = u;
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+    }
+
+    return lua_yield(L, 0);
+}
+
+
+static void
+ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
+{
+    ngx_http_request_t                  *r;
+    ngx_http_upstream_resolved_t        *ur;
+    ngx_http_lua_ctx_t                  *lctx;
+    lua_State                           *L;
+    ngx_http_lua_socket_udp_upstream_t  *u;
+    u_char                              *p;
+    size_t                               len;
+    struct sockaddr_in                  *sin;
+    ngx_uint_t                           i;
+    unsigned                             waiting;
+
+    u = ctx->data;
+    r = u->request;
+    ur = u->resolved;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket resolve handler");
+
+    lctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (lctx == NULL) {
+        return;
+    }
+
+    lctx->cur_co_ctx = u->co_ctx;
+
+    u->co_ctx->cleanup = NULL;
+
+    L = lctx->cur_co_ctx->co;
+
+    dd("setting socket_ready to 1");
+
+    waiting = u->waiting;
+
+    if (ctx->state) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua udp socket resolver error: %s (waiting: %d)",
+                       ngx_resolver_strerror(ctx->state), (int) u->waiting);
+
+        lua_pushnil(L);
+        lua_pushlstring(L, (char *) ctx->name.data, ctx->name.len);
+        lua_pushfstring(L, " could not be resolved (%d: %s)",
+                        (int) ctx->state,
+                        ngx_resolver_strerror(ctx->state));
+        lua_concat(L, 2);
+
+        u->prepare_retvals = ngx_http_lua_socket_error_retval_handler;
+        ngx_http_lua_socket_udp_handle_error(r, u,
+                                             NGX_HTTP_LUA_SOCKET_FT_RESOLVER);
+        return;
+    }
+
+    ur->naddrs = ctx->naddrs;
+    ur->addrs = ctx->addrs;
+
+#if (NGX_DEBUG)
+    {
+    in_addr_t   addr;
+    ngx_uint_t  i;
+
+    for (i = 0; i < ctx->naddrs; i++) {
+        dd("addr i: %d %p", (int) i,  &ctx->addrs[i]);
+
+        addr = ntohl(ctx->addrs[i]);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "name was resolved to %ud.%ud.%ud.%ud",
+                       (addr >> 24) & 0xff, (addr >> 16) & 0xff,
+                       (addr >> 8) & 0xff, addr & 0xff);
+    }
+    }
+#endif
+
+    if (ur->naddrs == 0) {
+        ngx_resolve_name_done(ctx);
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "name cannot be resolved to a address");
+        return;
+    }
+
+    if (ur->naddrs == 1) {
+        i = 0;
+
+    } else {
+        i = ngx_random() % ur->naddrs;
+    }
+
+    dd("selected addr index: %d", (int) i);
+
+    len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
+
+    p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
+    if (p == NULL) {
+        ngx_resolve_name_done(ctx);
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "out of memory");
+        return;
+    }
+
+    sin = (struct sockaddr_in *) &p[len];
+    ngx_memzero(sin, sizeof(struct sockaddr_in));
+
+    len = ngx_inet_ntop(AF_INET, &ur->addrs[i], p, NGX_INET_ADDRSTRLEN);
+    len = ngx_sprintf(&p[len], ":%d", ur->port) - p;
+
+    sin->sin_family = AF_INET;
+    sin->sin_port = htons(ur->port);
+    sin->sin_addr.s_addr = ur->addrs[i];
+
+    ur->sockaddr = (struct sockaddr *) sin;
+    ur->socklen = sizeof(struct sockaddr_in);
+
+    ur->host.data = p;
+    ur->host.len = len;
+    ur->naddrs = 1;
+
+    ur->ctx = NULL;
+
+    ngx_resolve_name_done(ctx);
+
+    u->waiting = 0;
+
+    if (waiting) {
+        lctx->resume_handler = ngx_http_lua_socket_udp_resume;
+        r->write_event_handler(r);
+
+    } else {
+        (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
+    }
+}
+
+
+static int
+ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, lua_State *L)
+{
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_co_ctx_t           *coctx;
+    ngx_udp_connection_t            *uc;
+    ngx_connection_t                *c;
+    ngx_http_cleanup_t              *cln;
+    ngx_http_upstream_resolved_t    *ur;
+    ngx_int_t                        rc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket resolve retval handler");
+
+    if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_RESOLVER) {
+        return 2;
+    }
+
+    uc = &u->udp_connection;
+
+    ur = u->resolved;
+
+    if (ur->sockaddr) {
+        uc->sockaddr = ur->sockaddr;
+        uc->socklen = ur->socklen;
+        uc->server = ur->host;
+
+    } else {
+        lua_pushnil(L);
+        lua_pushliteral(L, "resolver not working");
+        return 2;
+    }
+
+    rc = ngx_http_lua_udp_connect(uc);
+
+    if (rc != NGX_OK) {
+        u->socket_errno = ngx_socket_errno;
+    }
+
+    if (u->cleanup == NULL) {
+        cln = ngx_http_cleanup_add(r, 0);
+        if (cln == NULL) {
+            u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
+            lua_pushnil(L);
+            lua_pushliteral(L, "out of memory");
+            return 2;
+        }
+
+        cln->handler = ngx_http_lua_socket_udp_cleanup;
+        cln->data = u;
+        u->cleanup = &cln->handler;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket connect: %i", rc);
+
+    if (rc != NGX_OK) {
+        return ngx_http_lua_socket_error_retval_handler(r, u, L);
+    }
+
+    /* rc == NGX_OK */
+
+    c = uc->connection;
+
+    c->data = u;
+
+    c->write->handler = NULL;
+    c->read->handler = ngx_http_lua_socket_udp_handler;
+    c->read->resolver = 0;
+
+    c->pool = r->pool;
+    c->log = r->connection->log;
+    c->read->log = c->log;
+    c->write->log = c->log;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    coctx = ctx->cur_co_ctx;
+
+    coctx->data = u;
+
+    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
+
+    lua_pushinteger(L, 1);
+    return 1;
+}
+
+
+static int
+ngx_http_lua_socket_error_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, lua_State *L)
+{
+    u_char           errstr[NGX_MAX_ERROR_STR];
+    u_char          *p;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket error retval handler");
+
+    if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_RESOLVER) {
+        return 2;
+    }
+
+    lua_pushnil(L);
+
+    if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_PARTIALWRITE) {
+        lua_pushliteral(L, "partial write");
+
+    } else if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_TIMEOUT) {
+        lua_pushliteral(L, "timeout");
+
+    } else if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_CLOSED) {
+        lua_pushliteral(L, "closed");
+
+    } else if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_BUFTOOSMALL) {
+        lua_pushliteral(L, "buffer too small");
+
+    } else if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_NOMEM) {
+        lua_pushliteral(L, "out of memory");
+
+    } else {
+
+        if (u->socket_errno) {
+#if (nginx_version >= 1000000)
+            p = ngx_strerror(u->socket_errno, errstr, sizeof(errstr));
+#else
+            p = ngx_strerror_r(u->socket_errno, errstr, sizeof(errstr));
+#endif
+            /* for compatibility with LuaSocket */
+            ngx_strlow(errstr, errstr, p - errstr);
+            lua_pushlstring(L, (char *) errstr, p - errstr);
+
+        } else {
+            lua_pushliteral(L, "error");
+        }
+    }
+
+    return 2;
+}
+
+
+static int
+ngx_http_lua_socket_udp_send(lua_State *L)
+{
+    ssize_t                              n;
+    ngx_http_request_t                  *r;
+    u_char                              *p;
+    size_t                               len;
+    ngx_http_lua_socket_udp_upstream_t  *u;
+    int                                  type;
+    const char                          *msg;
+    ngx_str_t                            query;
+    ngx_http_lua_loc_conf_t             *llcf;
+
+    if (lua_gettop(L) != 2) {
+        return luaL_error(L, "expecting 2 arguments (including the object), "
+                          "but got %d", lua_gettop(L));
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "request object not found");
+    }
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
+    u = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (u == NULL || u->udp_connection.connection == NULL) {
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "attempt to send data on a closed socket: u:%p, c:%p",
+                          u, u ? u->udp_connection.connection : NULL);
+        }
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "closed");
+        return 2;
+    }
+
+    if (u->ft_type) {
+        u->ft_type = 0;
+    }
+
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+
+    type = lua_type(L, 2);
+    switch (type) {
+        case LUA_TNUMBER:
+        case LUA_TSTRING:
+            lua_tolstring(L, 2, &len);
+            break;
+
+        case LUA_TTABLE:
+            len = ngx_http_lua_calc_strlen_in_table(L, 2, 2, 1 /* strict */);
+            break;
+
+        default:
+            msg = lua_pushfstring(L, "string, number, boolean, nil, "
+                    "or array table expected, got %s",
+                    lua_typename(L, type));
+
+            return luaL_argerror(L, 2, msg);
+    }
+
+    query.data = lua_newuserdata(L, len);
+    query.len = len;
+
+    switch (type) {
+        case LUA_TNUMBER:
+        case LUA_TSTRING:
+            p = (u_char *) lua_tolstring(L, 2, &len);
+            ngx_memcpy(query.data, (u_char *) p, len);
+            break;
+
+        case LUA_TTABLE:
+            (void) ngx_http_lua_copy_str_in_table(L, 2, query.data);
+            break;
+
+        default:
+            return luaL_error(L, "impossible to reach here");
+    }
+
+    u->ft_type = 0;
+
+    /* mimic ngx_http_upstream_init_request here */
+
+#if 1
+    u->waiting = 0;
+#endif
+
+    dd("sending query %.*s", (int) query.len, query.data);
+
+    n = ngx_send(u->udp_connection.connection, query.data, query.len);
+
+    dd("ngx_send returns %d (query len %d)", (int) n, (int) query.len);
+
+    if (n == NGX_ERROR || n == NGX_AGAIN) {
+        u->socket_errno = ngx_socket_errno;
+
+        return ngx_http_lua_socket_error_retval_handler(r, u, L);
+    }
+
+    if (n != (ssize_t) query.len) {
+        dd("not the while query was sent");
+
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_PARTIALWRITE;
+        return ngx_http_lua_socket_error_retval_handler(r, u, L);
+    }
+
+    dd("n == len");
+
+    lua_pushinteger(L, 1);
+    return 1;
+}
+
+
+static int
+ngx_http_lua_socket_udp_receive(lua_State *L)
+{
+    ngx_http_request_t                  *r;
+    ngx_http_lua_socket_udp_upstream_t  *u;
+    ngx_int_t                            rc;
+    ngx_http_lua_ctx_t                  *ctx;
+    ngx_http_lua_co_ctx_t               *coctx;
+    size_t                               size;
+    int                                  nargs;
+    ngx_http_lua_loc_conf_t             *llcf;
+
+    nargs = lua_gettop(L);
+    if (nargs != 1 && nargs != 2) {
+        return luaL_error(L, "expecting 1 or 2 arguments "
+                          "(including the object), but got %d", nargs);
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket calling receive() method");
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
+    u = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (u == NULL || u->udp_connection.connection == NULL) {
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "attempt to receive data on a closed socket: u:%p, "
+                          "c:%p", u, u ? u->udp_connection.connection : NULL);
+        }
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "closed");
+        return 2;
+    }
+
+    if (u->ft_type) {
+        u->ft_type = 0;
+    }
+
+#if 1
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+#endif
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket read timeout: %M", u->read_timeout);
+
+    size = (size_t) luaL_optnumber(L, 2, UDP_MAX_DATAGRAM_SIZE);
+    size = ngx_min(size, UDP_MAX_DATAGRAM_SIZE);
+
+    u->recv_buf_size = size;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket receive buffer size: %uz", u->recv_buf_size);
+
+    rc = ngx_http_lua_socket_udp_read(r, u);
+
+    if (rc == NGX_ERROR) {
+        dd("read failed: %d", (int) u->ft_type);
+        rc = ngx_http_lua_socket_udp_receive_retval_handler(r, u, L);
+        dd("udp receive retval returned: %d", (int) rc);
+        return rc;
+    }
+
+    if (rc == NGX_OK) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua udp socket receive done in a single run");
+
+        return ngx_http_lua_socket_udp_receive_retval_handler(r, u, L);
+    }
+
+    /* n == NGX_AGAIN */
+
+    u->read_event_handler = ngx_http_lua_socket_udp_read_handler;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ctx->cur_co_ctx->cleanup = ngx_http_lua_udp_socket_cleanup;
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+    }
+
+    u->co_ctx = ctx->cur_co_ctx;
+    u->waiting = 1;
+    u->prepare_retvals = ngx_http_lua_socket_udp_receive_retval_handler;
+
+    coctx = ctx->cur_co_ctx;
+    coctx->data = u;
+
+    return lua_yield(L, 0);
+}
+
+
+static int
+ngx_http_lua_socket_udp_receive_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, lua_State *L)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket receive return value handler");
+
+    if (u->ft_type) {
+        return ngx_http_lua_socket_error_retval_handler(r, u, L);
+    }
+
+    lua_pushlstring(L, (char *) ngx_http_lua_socket_udp_buffer, u->received);
+    return 1;
+}
+
+
+static int
+ngx_http_lua_socket_udp_settimeout(lua_State *L)
+{
+    int                     n;
+    ngx_int_t               timeout;
+
+    ngx_http_lua_socket_udp_upstream_t  *u;
+
+    n = lua_gettop(L);
+
+    if (n != 2) {
+        return luaL_error(L, "ngx.socket settimout: expecting at least 2 "
+                          "arguments (including the object) but seen %d",
+                          lua_gettop(L));
+    }
+
+    timeout = (ngx_int_t) lua_tonumber(L, 2);
+
+    lua_rawseti(L, 1, SOCKET_TIMEOUT_INDEX);
+
+    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
+    u = lua_touserdata(L, -1);
+
+    if (u) {
+        if (timeout > 0) {
+            u->read_timeout = (ngx_msec_t) timeout;
+
+        } else {
+            u->read_timeout = u->conf->read_timeout;
+        }
+    }
+
+    return 0;
+}
+
+
+static void
+ngx_http_lua_socket_udp_finalize(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua finalize socket");
+
+    if (u->cleanup) {
+        *u->cleanup = NULL;
+        u->cleanup = NULL;
+    }
+
+    if (u->resolved && u->resolved->ctx) {
+        ngx_resolve_name_done(u->resolved->ctx);
+        u->resolved->ctx = NULL;
+    }
+
+    if (u->udp_connection.connection) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua close socket connection");
+
+        ngx_close_connection(u->udp_connection.connection);
+        u->udp_connection.connection = NULL;
+    }
+
+    if (u->waiting) {
+        u->waiting = 0;
+    }
+}
+
+
+static int
+ngx_http_lua_socket_udp_upstream_destroy(lua_State *L)
+{
+    ngx_http_lua_socket_udp_upstream_t      *u;
+
+    dd("upstream destroy triggered by Lua GC");
+
+    u = lua_touserdata(L, 1);
+    if (u == NULL) {
+        return 0;
+    }
+
+    if (u->cleanup) {
+        ngx_http_lua_socket_udp_cleanup(u); /* it will clear u->cleanup */
+    }
+
+    return 0;
+}
+
+
+static void
+ngx_http_lua_socket_dummy_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket dummy handler");
+}
+
+
+static ngx_int_t
+ngx_http_lua_socket_udp_read(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u)
+{
+    ngx_connection_t            *c;
+    ngx_event_t                 *rev;
+    ssize_t                      n;
+
+    c = u->udp_connection.connection;
+    rev = c->read;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "lua udp socket read data: waiting: %d", (int) u->waiting);
+
+    n = ngx_udp_recv(u->udp_connection.connection,
+                     ngx_http_lua_socket_udp_buffer, u->recv_buf_size);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "lua udp recv returned %z", n);
+
+    if (n >= 0) {
+        u->received = n;
+        ngx_http_lua_socket_udp_handle_success(r, u);
+        return NGX_OK;
+    }
+
+    if (n == NGX_ERROR) {
+        u->socket_errno = ngx_socket_errno;
+        ngx_http_lua_socket_udp_handle_error(r, u,
+                                             NGX_HTTP_LUA_SOCKET_FT_ERROR);
+        return NGX_ERROR;
+    }
+
+    /* n == NGX_AGAIN */
+
+#if 1
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_http_lua_socket_udp_handle_error(r, u,
+                                             NGX_HTTP_LUA_SOCKET_FT_ERROR);
+        return NGX_ERROR;
+    }
+#endif
+
+    if (rev->active) {
+        ngx_add_timer(rev, u->read_timeout);
+
+    } else if (rev->timer_set) {
+        ngx_del_timer(rev);
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static void
+ngx_http_lua_socket_udp_read_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u)
+{
+    ngx_connection_t            *c;
+    ngx_http_lua_loc_conf_t     *llcf;
+
+    c = u->udp_connection.connection;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket read handler");
+
+    if (c->read->timedout) {
+        c->read->timedout = 0;
+
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_socket_errors) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "lua udp socket read timed out");
+        }
+
+        ngx_http_lua_socket_udp_handle_error(r, u,
+                                             NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
+        return;
+    }
+
+#if 1
+    if (c->read->timer_set) {
+        ngx_del_timer(c->read);
+    }
+#endif
+
+    (void) ngx_http_lua_socket_udp_read(r, u);
+}
+
+
+static void
+ngx_http_lua_socket_udp_handle_error(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u, ngx_uint_t ft_type)
+{
+    ngx_http_lua_ctx_t          *ctx;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket handle error");
+
+    u->ft_type |= ft_type;
+
+#if 0
+    ngx_http_lua_socket_udp_finalize(r, u);
+#endif
+
+    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
+
+    if (u->co_ctx) {
+        u->co_ctx->cleanup = NULL;
+    }
+
+    if (u->waiting) {
+        u->waiting = 0;
+
+        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+        if (ctx == NULL) {
+            return;
+        }
+
+        ctx->resume_handler = ngx_http_lua_socket_udp_resume;
+        ctx->cur_co_ctx = u->co_ctx;
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua udp socket waking up the current request");
+
+        r->write_event_handler(r);
+    }
+}
+
+
+static void
+ngx_http_lua_socket_udp_cleanup(void *data)
+{
+    ngx_http_lua_socket_udp_upstream_t  *u = data;
+
+    ngx_http_request_t  *r;
+
+    r = u->request;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "cleanup lua udp socket upstream request: \"%V\"", &r->uri);
+
+    ngx_http_lua_socket_udp_finalize(r, u);
+}
+
+
+static void
+ngx_http_lua_socket_udp_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c;
+    ngx_http_request_t              *r;
+    ngx_http_log_ctx_t              *ctx;
+
+    ngx_http_lua_socket_udp_upstream_t  *u;
+
+    c = ev->data;
+    u = c->data;
+    r = u->request;
+    c = r->connection;
+
+    ctx = c->log->data;
+    ctx->current_request = r;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket handler for \"%V?%V\", wev %d", &r->uri,
+                   &r->args, (int) ev->write);
+
+    u->read_event_handler(r, u);
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static void
+ngx_http_lua_socket_udp_handle_success(ngx_http_request_t *r,
+    ngx_http_lua_socket_udp_upstream_t *u)
+{
+    ngx_http_lua_ctx_t          *ctx;
+
+    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
+
+    if (u->co_ctx) {
+        u->co_ctx->cleanup = NULL;
+    }
+
+    if (u->waiting) {
+        u->waiting = 0;
+
+        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+        if (ctx == NULL) {
+            return;
+        }
+
+        ctx->resume_handler = ngx_http_lua_socket_udp_resume;
+        ctx->cur_co_ctx = u->co_ctx;
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua udp socket waking up the current request");
+
+        r->write_event_handler(r);
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_udp_connect(ngx_udp_connection_t *uc)
+{
+    int                rc;
+    ngx_int_t          event;
+    ngx_event_t       *rev, *wev;
+    ngx_socket_t       s;
+    ngx_connection_t  *c;
+
+    s = ngx_socket(uc->sockaddr->sa_family, SOCK_DGRAM, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s);
+
+    if (s == -1) {
+        ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+                      ngx_socket_n " failed");
+
+        return NGX_ERROR;
+    }
+
+    c = ngx_get_connection(s, &uc->log);
+
+    if (c == NULL) {
+        if (ngx_close_socket(s) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+                          ngx_close_socket_n "failed");
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (ngx_nonblocking(s) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+                      ngx_nonblocking_n " failed");
+
+        ngx_free_connection(c);
+
+        if (ngx_close_socket(s) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+                          ngx_close_socket_n " failed");
+        }
+
+        return NGX_ERROR;
+    }
+
+    rev = c->read;
+    wev = c->write;
+
+    rev->log = &uc->log;
+    wev->log = &uc->log;
+
+    uc->connection = c;
+
+    c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+#if (NGX_THREADS)
+
+    /* TODO: lock event when call completion handler */
+
+    rev->lock = &c->lock;
+    wev->lock = &c->lock;
+    rev->own_lock = &c->lock;
+    wev->own_lock = &c->lock;
+
+#endif
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0,
+                   "connect to %V, fd:%d #%d", &uc->server, s, c->number);
+
+    rc = connect(s, uc->sockaddr, uc->socklen);
+
+    /* TODO: aio, iocp */
+
+    if (rc == -1) {
+        ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno,
+                      "connect() failed");
+
+        return NGX_ERROR;
+    }
+
+    /* UDP sockets are always ready to write */
+    wev->ready = 1;
+
+    if (ngx_add_event) {
+
+        event = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ?
+                    /* kqueue, epoll */                 NGX_CLEAR_EVENT:
+                    /* select, poll, /dev/poll */       NGX_LEVEL_EVENT;
+                    /* eventport event type has no meaning: oneshot only */
+
+        if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+    } else {
+        /* rtsig */
+
+        if (ngx_add_conn(c) == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static int
+ngx_http_lua_socket_udp_close(lua_State *L)
+{
+    ngx_http_request_t                  *r;
+    ngx_http_lua_socket_udp_upstream_t  *u;
+
+    if (lua_gettop(L) != 1) {
+        return luaL_error(L, "expecting 1 argument "
+                          "(including the object) but seen %d", lua_gettop(L));
+    }
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
+    u = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (u == NULL || u->udp_connection.connection == NULL) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "closed");
+        return 2;
+    }
+
+    if (u->waiting) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "socket busy");
+        return 2;
+    }
+
+    ngx_http_lua_socket_udp_finalize(r, u);
+
+    lua_pushinteger(L, 1);
+    return 1;
+}
+
+
+static ngx_int_t
+ngx_http_lua_socket_udp_resume(ngx_http_request_t *r)
+{
+    int                          nret;
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    ngx_http_lua_socket_udp_upstream_t      *u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp operation done, resuming lua thread");
+
+    coctx = ctx->cur_co_ctx;
+
+#if 0
+    ngx_http_lua_probe_info("udp resume");
+#endif
+
+    u = coctx->data;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua udp socket calling prepare retvals handler %p, "
+                   "u:%p", u->prepare_retvals, u);
+
+    nret = u->prepare_retvals(r, u, ctx->cur_co_ctx->co);
+    if (nret == NGX_AGAIN) {
+        return NGX_DONE;
+    }
+
+    c = r->connection;
+
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, nret);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_udp_resolve_cleanup(void *data)
+{
+    ngx_resolver_ctx_t                      *rctx;
+    ngx_http_lua_socket_udp_upstream_t      *u;
+    ngx_http_lua_co_ctx_t                   *coctx = data;
+
+    u = coctx->data;
+    if (u == NULL) {
+        return;
+    }
+
+    rctx = u->resolved->ctx;
+    if (rctx == NULL) {
+        return;
+    }
+
+    ngx_resolve_name_done(rctx);
+}
+
+
+static void
+ngx_http_lua_udp_socket_cleanup(void *data)
+{
+    ngx_http_lua_socket_udp_upstream_t      *u;
+    ngx_http_lua_co_ctx_t                   *coctx = data;
+
+    u = coctx->data;
+    if (u == NULL) {
+        return;
+    }
+
+    if (u->request == NULL) {
+        return;
+    }
+
+    ngx_http_lua_socket_udp_finalize(u->request, u);
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
new file mode 100644
index 0000000..b64fcc8
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
@@ -0,0 +1,49 @@
+#ifndef NGX_HTTP_LUA_SOCKET_UDP_H
+#define NGX_HTTP_LUA_SOCKET_UDP_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+typedef struct ngx_http_lua_socket_udp_upstream_s
+        ngx_http_lua_socket_udp_upstream_t;
+
+
+typedef
+    int (*ngx_http_lua_socket_udp_retval_handler)(ngx_http_request_t *r,
+        ngx_http_lua_socket_udp_upstream_t *u, lua_State *L);
+
+
+typedef void (*ngx_http_lua_socket_udp_upstream_handler_pt)(
+          ngx_http_request_t *r, ngx_http_lua_socket_udp_upstream_t *u);
+
+
+struct ngx_http_lua_socket_udp_upstream_s {
+    ngx_http_lua_socket_udp_retval_handler          prepare_retvals;
+    ngx_http_lua_socket_udp_upstream_handler_pt     read_event_handler;
+
+    ngx_http_lua_loc_conf_t         *conf;
+    ngx_http_cleanup_pt             *cleanup;
+    ngx_http_request_t              *request;
+    ngx_udp_connection_t             udp_connection;
+
+    ngx_msec_t                       read_timeout;
+
+    ngx_http_upstream_resolved_t    *resolved;
+
+    ngx_uint_t                       ft_type;
+    ngx_err_t                        socket_errno;
+    size_t                           received; /* for receive */
+    size_t                           recv_buf_size;
+
+    ngx_http_lua_co_ctx_t           *co_ctx;
+
+    unsigned                         waiting; /* :1 */
+};
+
+
+void ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_SOCKET_UDP_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_string.c b/debian/modules/nginx-lua/src/ngx_http_lua_string.c
index 101a38f..51b8657 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_string.c
@@ -105,7 +105,8 @@ ngx_http_lua_ngx_escape_uri(lua_State *L)
     uintptr_t                escape;
     u_char                  *src, *dst;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -154,7 +155,8 @@ ngx_http_lua_ngx_unescape_uri(lua_State *L)
     u_char                  *p;
     u_char                  *src, *dst;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -194,7 +196,8 @@ ngx_http_lua_ngx_quote_sql_str(lua_State *L)
     u_char                  *p;
     u_char                  *src, *dst;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -438,7 +441,8 @@ ngx_http_lua_ngx_decode_base64(lua_State *L)
     ngx_http_request_t      *r;
     ngx_str_t                p, src;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -484,7 +488,8 @@ ngx_http_lua_ngx_encode_base64(lua_State *L)
     ngx_http_request_t      *r;
     ngx_str_t                p, src;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -567,7 +572,8 @@ ngx_http_lua_ngx_encode_args(lua_State *L) {
                 lua_gettop(L));
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -608,7 +614,8 @@ ngx_http_lua_ngx_decode_args(lua_State *L) {
         max = NGX_HTTP_LUA_MAX_ARGS;
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
index deb1710..9b8e8a0 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
@@ -7,6 +7,9 @@
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_ctx.h"
 #include "ngx_http_lua_contentby.h"
+#if defined(NGX_DTRACE) && NGX_DTRACE
+#include "ngx_http_probe.h"
+#endif
 
 
 #define NGX_HTTP_LUA_SHARE_ALL_VARS     0x01
@@ -15,13 +18,13 @@
 
 #define ngx_http_lua_method_name(m) { sizeof(m) - 1, (u_char *) m " " }
 
-static ngx_str_t  ngx_http_lua_get_method = ngx_http_lua_method_name("GET");
-static ngx_str_t  ngx_http_lua_put_method = ngx_http_lua_method_name("PUT");
-static ngx_str_t  ngx_http_lua_post_method = ngx_http_lua_method_name("POST");
-static ngx_str_t  ngx_http_lua_head_method = ngx_http_lua_method_name("HEAD");
-static ngx_str_t  ngx_http_lua_delete_method =
+ngx_str_t  ngx_http_lua_get_method = ngx_http_lua_method_name("GET");
+ngx_str_t  ngx_http_lua_put_method = ngx_http_lua_method_name("PUT");
+ngx_str_t  ngx_http_lua_post_method = ngx_http_lua_method_name("POST");
+ngx_str_t  ngx_http_lua_head_method = ngx_http_lua_method_name("HEAD");
+ngx_str_t  ngx_http_lua_delete_method =
         ngx_http_lua_method_name("DELETE");
-static ngx_str_t  ngx_http_lua_options_method =
+ngx_str_t  ngx_http_lua_options_method =
         ngx_http_lua_method_name("OPTIONS");
 
 
@@ -40,6 +43,14 @@ static void ngx_http_lua_process_vars_option(ngx_http_request_t *r,
     lua_State *L, int table, ngx_array_t **varsp);
 static ngx_int_t ngx_http_lua_subrequest_add_extra_vars(ngx_http_request_t *r,
     ngx_array_t *extra_vars);
+static ngx_int_t ngx_http_lua_subrequest(ngx_http_request_t *r,
+    ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr,
+    ngx_http_post_subrequest_t *ps, ngx_uint_t flags);
+static ngx_int_t ngx_http_lua_subrequest_resume(ngx_http_request_t *r);
+static void ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx);
+static void ngx_http_lua_cancel_subreq(ngx_http_request_t *r);
+static ngx_int_t ngx_http_post_request_to_head(ngx_http_request_t *r);
 
 
 /* ngx.location.capture is just a thin wrapper around
@@ -103,6 +114,9 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
     size_t                           sr_headers_len;
     size_t                           sr_bodies_len;
     unsigned                         custom_ctx;
+    ngx_http_lua_co_ctx_t           *coctx;
+
+    ngx_http_lua_post_subrequest_data_t      *psr_data;
 
     n = lua_gettop(L);
     if (n != 1) {
@@ -116,7 +130,8 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         return luaL_error(L, "at least one subrequest should be specified");
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -129,6 +144,15 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         return luaL_error(L, "no ctx found");
     }
 
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    coctx = ctx->cur_co_ctx;
+    if (coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
+    }
+
     sr_statuses_len = nsubreqs * sizeof(ngx_int_t);
     sr_headers_len  = nsubreqs * sizeof(ngx_http_headers_out_t *);
     sr_bodies_len   = nsubreqs * sizeof(ngx_str_t);
@@ -140,26 +164,22 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         return luaL_error(L, "out of memory");
     }
 
-    ctx->sr_statuses = (void *) p;
+    coctx->sr_statuses = (void *) p;
     p += sr_statuses_len;
 
-    ctx->sr_headers = (void *) p;
+    coctx->sr_headers = (void *) p;
     p += sr_headers_len;
 
-    ctx->sr_bodies = (void *) p;
+    coctx->sr_bodies = (void *) p;
 
-    ctx->nsubreqs = nsubreqs;
+    coctx->nsubreqs = nsubreqs;
 
-    n = lua_gettop(L);
-    dd("top before loop: %d", n);
-
-    ctx->done = 0;
-    ctx->waiting = 0;
+    coctx->pending_subreqs = 0;
 
     extra_vars = NULL;
 
     for (index = 0; index < nsubreqs; index++) {
-        ctx->waiting++;
+        coctx->pending_subreqs++;
 
         lua_rawgeti(L, 1, index + 1);
         if (lua_isnil(L, -1)) {
@@ -414,9 +434,6 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
 
         /* stack: queries query uri ctx? */
 
-        n = lua_gettop(L);
-        dd("top size so far: %d", n);
-
         p = (u_char *) luaL_checklstring(L, 3, &len);
 
         uri.data = ngx_palloc(r->pool, len);
@@ -460,32 +477,42 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
             args.len = len;
         }
 
-        psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
-        if (psr == NULL) {
-            return luaL_error(L, "memory allocation error");
-        }
-
-        sr_ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_ctx_t));
-        if (sr_ctx == NULL) {
+        p = ngx_pnalloc(r->pool, sizeof(ngx_http_post_subrequest_t)
+                        + sizeof(ngx_http_lua_ctx_t)
+                        + sizeof(ngx_http_lua_post_subrequest_data_t));
+        if (p == NULL) {
             return luaL_error(L, "out of memory");
         }
 
-        /* set by ngx_pcalloc:
+        psr = (ngx_http_post_subrequest_t *) p;
+
+        p += sizeof(ngx_http_post_subrequest_t);
+
+        sr_ctx = (ngx_http_lua_ctx_t *) p;
+
+        p += sizeof(ngx_http_lua_ctx_t);
+
+        psr_data = (ngx_http_lua_post_subrequest_data_t *) p;
+
+        ngx_memzero(sr_ctx, sizeof(ngx_http_lua_ctx_t));
+
+        /* set by ngx_memzero:
          *      sr_ctx->run_post_subrequest = 0
          *      sr_ctx->free = NULL
          */
 
-        sr_ctx->cc_ref = LUA_NOREF;
-        sr_ctx->ctx_ref = LUA_NOREF;
+        ngx_http_lua_init_ctx(sr_ctx);
 
         sr_ctx->capture = 1;
-
         sr_ctx->index = index;
 
-        psr->handler = ngx_http_lua_post_subrequest;
-        psr->data = sr_ctx;
+        psr_data->ctx = sr_ctx;
+        psr_data->pr_co_ctx = coctx;
 
-        rc = ngx_http_subrequest(r, &uri, &args, &sr, psr, 0);
+        psr->handler = ngx_http_lua_post_subrequest;
+        psr->data = psr_data;
+
+        rc = ngx_http_lua_subrequest(r, &uri, &args, &sr, psr, 0);
 
         if (rc != NGX_OK) {
             return luaL_error(L, "failed to issue subrequest: %d", (int) rc);
@@ -494,11 +521,12 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         ngx_http_set_ctx(sr, sr_ctx, ngx_http_lua_module);
 
         rc = ngx_http_lua_adjust_subrequest(sr, method, body, vars_action,
-                extra_vars);
+                                            extra_vars);
 
         if (rc != NGX_OK) {
+            ngx_http_lua_cancel_subreq(sr);
             return luaL_error(L, "failed to adjust the subrequest: %d",
-                    (int) rc);
+                              (int) rc);
         }
 
         dd("queries query uri opts ctx? %d", lua_gettop(L));
@@ -520,6 +548,8 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         ngx_array_destroy(extra_vars);
     }
 
+    ctx->no_abort = 1;
+
     return lua_yield(L, 0);
 }
 
@@ -798,26 +828,30 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
 {
     ngx_http_request_t            *pr;
     ngx_http_lua_ctx_t            *pr_ctx;
-    ngx_http_lua_ctx_t            *ctx = data;
+    ngx_http_lua_ctx_t            *ctx; /* subrequest ctx */
+    ngx_http_lua_co_ctx_t         *pr_coctx;
     size_t                         len;
     ngx_str_t                     *body_str;
     u_char                        *p;
     ngx_chain_t                   *cl;
 
+    ngx_http_lua_post_subrequest_data_t    *psr_data = data;
+
+    ctx = psr_data->ctx;
+
     if (ctx->run_post_subrequest) {
-        return rc;
+        if (r != r->connection->data) {
+            r->connection->data = r;
+        }
+
+        return NGX_OK;
     }
 
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua run post subrequest handler: rc:%d, waiting:%d, done:%d",
-            rc, ctx->waiting, ctx->done);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run post subrequest handler: rc:%d", rc);
 
     ctx->run_post_subrequest = 1;
 
-#if 0
-    ngx_http_lua_dump_postponed(r);
-#endif
-
     pr = r->parent;
 
     pr_ctx = ngx_http_get_module_ctx(pr, ngx_http_lua_module);
@@ -825,15 +859,20 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
         return NGX_ERROR;
     }
 
-    pr_ctx->waiting--;
+    pr_coctx = psr_data->pr_co_ctx;
+    pr_coctx->pending_subreqs--;
 
-    if (pr_ctx->waiting == 0) {
-        pr_ctx->done = 1;
+    if (pr_coctx->pending_subreqs == 0) {
+        dd("all subrequests are done");
+
+        pr_ctx->no_abort = 0;
+        pr_ctx->resume_handler = ngx_http_lua_subrequest_resume;
+        pr_ctx->cur_co_ctx = pr_coctx;
     }
 
     if (pr_ctx->entered_content_phase) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua restoring write event handler");
+                       "lua restoring write event handler");
 
         pr->write_event_handler = ngx_http_lua_content_wev_handler;
     }
@@ -844,30 +883,32 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
 
     /*  capture subrequest response status */
     if (rc == NGX_ERROR) {
-        pr_ctx->sr_statuses[ctx->index] = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        pr_coctx->sr_statuses[ctx->index] = NGX_HTTP_INTERNAL_SERVER_ERROR;
 
     } else if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        dd("HERE");
-        pr_ctx->sr_statuses[ctx->index] = rc;
+        pr_coctx->sr_statuses[ctx->index] = rc;
 
     } else {
-        dd("THERE");
-        pr_ctx->sr_statuses[ctx->index] = r->headers_out.status;
+        pr_coctx->sr_statuses[ctx->index] = r->headers_out.status;
     }
 
-    if (pr_ctx->sr_statuses[ctx->index] == 0) {
-        pr_ctx->sr_statuses[ctx->index] = NGX_HTTP_OK;
+    if (r->headers_out.status >= NGX_HTTP_SPECIAL_RESPONSE) {
+        pr_coctx->sr_statuses[ctx->index] = r->headers_out.status;
     }
 
-    dd("pr_ctx status: %d", (int) pr_ctx->sr_statuses[ctx->index]);
+    if (pr_coctx->sr_statuses[ctx->index] == 0) {
+        pr_coctx->sr_statuses[ctx->index] = NGX_HTTP_OK;
+    }
+
+    dd("pr_coctx status: %d", (int) pr_coctx->sr_statuses[ctx->index]);
 
     /* copy subrequest response headers */
 
-    pr_ctx->sr_headers[ctx->index] = &r->headers_out;
+    pr_coctx->sr_headers[ctx->index] = &r->headers_out;
 
     /* copy subrequest response body */
 
-    body_str = &pr_ctx->sr_bodies[ctx->index];
+    body_str = &pr_coctx->sr_bodies[ctx->index];
 
     len = 0;
     for (cl = ctx->body; cl; cl = cl->next) {
@@ -891,8 +932,7 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
         /* copy from and then free the data buffers */
 
         for (cl = ctx->body; cl; cl = cl->next) {
-            p = ngx_copy(p, cl->buf->pos,
-                    cl->buf->last - cl->buf->pos);
+            p = ngx_copy(p, cl->buf->pos, cl->buf->last - cl->buf->pos);
 
             cl->buf->last = cl->buf->pos;
 
@@ -917,17 +957,40 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
         dd("free bufs: %p", pr_ctx->free_bufs);
     }
 
-    /* work-around issues in nginx's event module */
+    ngx_http_post_request_to_head(pr);
 
-    if (r != r->connection->data && r->postponed &&
-            (r->main->posted_requests == NULL ||
-            r->main->posted_requests->request != pr))
+    if (r != r->connection->data) {
+        r->connection->data = r;
+    }
+
+    if (rc == NGX_ERROR
+        || rc == NGX_HTTP_CREATED
+        || rc == NGX_HTTP_NO_CONTENT
+        || (rc >= NGX_HTTP_SPECIAL_RESPONSE
+            && rc != NGX_HTTP_CLOSE
+            && rc != NGX_HTTP_REQUEST_TIME_OUT
+            && rc != NGX_HTTP_CLIENT_CLOSED_REQUEST))
     {
-#if defined(nginx_version) && nginx_version >= 8012
-        ngx_http_post_request(pr, NULL);
-#else
-        ngx_http_post_request(pr);
-#endif
+        /* emulate ngx_http_special_response_handler */
+
+        if (rc > NGX_OK) {
+            r->err_status = rc;
+
+            r->expect_tested = 1;
+            r->headers_out.content_type.len = 0;
+            r->headers_out.content_length_n = 0;
+
+            ngx_http_clear_accept_ranges(r);
+            ngx_http_clear_last_modified(r);
+
+            rc = ngx_http_send_header(r);
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+        }
+
+        return NGX_OK;
     }
 
     return rc;
@@ -1034,45 +1097,47 @@ ngx_http_lua_set_content_length_header(ngx_http_request_t *r, off_t len)
 }
 
 
-void
+static void
 ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx)
+    ngx_http_lua_ctx_t *ctx)
 {
+    ngx_uint_t                   i;
     ngx_uint_t                   index;
-    lua_State                   *cc;
+    lua_State                   *co;
     ngx_str_t                   *body_str;
     ngx_table_elt_t             *header;
     ngx_list_part_t             *part;
     ngx_http_headers_out_t      *sr_headers;
-    ngx_uint_t                   i;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     u_char                  buf[sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1];
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua handle subrequest responses");
+                   "lua handle subrequest responses");
 
-    for (index = 0; index < ctx->nsubreqs; index++) {
-        dd("summary: reqs %d, subquery %d, waiting %d, req %.*s",
-                (int) ctx->nsubreqs,
+    coctx = ctx->cur_co_ctx;
+    co = coctx->co;
+
+    for (index = 0; index < coctx->nsubreqs; index++) {
+        dd("summary: reqs %d, subquery %d, pending %d, req %.*s",
+                (int) coctx->nsubreqs,
                 (int) index,
-                (int) ctx->waiting,
+                (int) coctx->pending_subreqs,
                 (int) r->uri.len, r->uri.data);
 
-        cc = ctx->cc;
-
         /*  {{{ construct ret value */
-        lua_newtable(cc);
+        lua_newtable(co);
 
         /*  copy captured status */
-        lua_pushinteger(cc, ctx->sr_statuses[index]);
-        lua_setfield(cc, -2, "status");
+        lua_pushinteger(co, coctx->sr_statuses[index]);
+        lua_setfield(co, -2, "status");
 
         /*  copy captured body */
 
-        body_str = &ctx->sr_bodies[index];
+        body_str = &coctx->sr_bodies[index];
 
-        lua_pushlstring(cc, (char *) body_str->data, body_str->len);
-        lua_setfield(cc, -2, "body");
+        lua_pushlstring(co, (char *) body_str->data, body_str->len);
+        lua_setfield(co, -2, "body");
 
         if (body_str->data) {
             dd("free body buffer ASAP");
@@ -1081,9 +1146,9 @@ ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
 
         /* copy captured headers */
 
-        lua_newtable(cc); /* res.header */
+        lua_newtable(co); /* res.header */
 
-        sr_headers = ctx->sr_headers[index];
+        sr_headers = coctx->sr_headers[index];
 
         dd("saving subrequest response headers");
 
@@ -1116,77 +1181,77 @@ ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
             dd("pushing sr header %.*s", (int) header[i].key.len,
                     header[i].key.data);
 
-            lua_pushlstring(cc, (char *) header[i].key.data,
+            lua_pushlstring(co, (char *) header[i].key.data,
                     header[i].key.len); /* header key */
-            lua_pushvalue(cc, -1); /* stack: table key key */
+            lua_pushvalue(co, -1); /* stack: table key key */
 
             /* check if header already exists */
-            lua_rawget(cc, -3); /* stack: table key value */
+            lua_rawget(co, -3); /* stack: table key value */
 
-            if (lua_isnil(cc, -1)) {
-                lua_pop(cc, 1); /* stack: table key */
+            if (lua_isnil(co, -1)) {
+                lua_pop(co, 1); /* stack: table key */
 
-                lua_pushlstring(cc, (char *) header[i].value.data,
+                lua_pushlstring(co, (char *) header[i].value.data,
                         header[i].value.len); /* stack: table key value */
 
-                lua_rawset(cc, -3); /* stack: table */
+                lua_rawset(co, -3); /* stack: table */
 
             } else {
 
-                if (!lua_istable(cc, -1)) { /* already inserted one value */
-                    lua_createtable(cc, 4, 0);
+                if (!lua_istable(co, -1)) { /* already inserted one value */
+                    lua_createtable(co, 4, 0);
                         /* stack: table key value table */
 
-                    lua_insert(cc, -2); /* stack: table key table value */
-                    lua_rawseti(cc, -2, 1); /* stack: table key table */
+                    lua_insert(co, -2); /* stack: table key table value */
+                    lua_rawseti(co, -2, 1); /* stack: table key table */
 
-                    lua_pushlstring(cc, (char *) header[i].value.data,
+                    lua_pushlstring(co, (char *) header[i].value.data,
                             header[i].value.len);
                         /* stack: table key table value */
 
-                    lua_rawseti(cc, -2, lua_objlen(cc, -2) + 1);
+                    lua_rawseti(co, -2, lua_objlen(co, -2) + 1);
                         /* stack: table key table */
 
-                    lua_rawset(cc, -3); /* stack: table */
+                    lua_rawset(co, -3); /* stack: table */
 
                 } else {
-                    lua_pushlstring(cc, (char *) header[i].value.data,
+                    lua_pushlstring(co, (char *) header[i].value.data,
                             header[i].value.len);
                         /* stack: table key table value */
 
-                    lua_rawseti(cc, -2, lua_objlen(cc, -2) + 1);
+                    lua_rawseti(co, -2, lua_objlen(co, -2) + 1);
                         /* stack: table key table */
 
-                    lua_pop(cc, 2); /* stack: table */
+                    lua_pop(co, 2); /* stack: table */
                 }
             }
         }
 
         if (sr_headers->content_type.len) {
-            lua_pushliteral(cc, "Content-Type"); /* header key */
-            lua_pushlstring(cc, (char *) sr_headers->content_type.data,
+            lua_pushliteral(co, "Content-Type"); /* header key */
+            lua_pushlstring(co, (char *) sr_headers->content_type.data,
                     sr_headers->content_type.len); /* head key value */
-            lua_rawset(cc, -3); /* head */
+            lua_rawset(co, -3); /* head */
         }
 
         if (sr_headers->content_length == NULL
             && sr_headers->content_length_n >= 0)
         {
-            lua_pushliteral(cc, "Content-Length"); /* header key */
+            lua_pushliteral(co, "Content-Length"); /* header key */
 
-            lua_pushnumber(cc, sr_headers->content_length_n);
+            lua_pushnumber(co, sr_headers->content_length_n);
                 /* head key value */
 
-            lua_rawset(cc, -3); /* head */
+            lua_rawset(co, -3); /* head */
         }
 
         /* to work-around an issue in ngx_http_static_module
          * (github issue #41) */
         if (sr_headers->location && sr_headers->location->value.len) {
-            lua_pushliteral(cc, "Location"); /* header key */
-            lua_pushlstring(cc, (char *) sr_headers->location->value.data,
+            lua_pushliteral(co, "Location"); /* header key */
+            lua_pushlstring(co, (char *) sr_headers->location->value.data,
                     sr_headers->location->value.len); /* head key value */
-            lua_rawset(cc, -3); /* head */
+            lua_rawset(co, -3); /* head */
         }
 
         if (sr_headers->last_modified_time != -1) {
@@ -1205,12 +1270,12 @@ ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
         {
             (void) ngx_http_time(buf, sr_headers->last_modified_time);
 
-            lua_pushliteral(cc, "Last-Modified"); /* header key */
-            lua_pushlstring(cc, (char *) buf, sizeof(buf)); /* head key value */
-            lua_rawset(cc, -3); /* head */
+            lua_pushliteral(co, "Last-Modified"); /* header key */
+            lua_pushlstring(co, (char *) buf, sizeof(buf)); /* head key value */
+            lua_rawset(co, -3); /* head */
         }
 
-        lua_setfield(cc, -2, "header");
+        lua_setfield(co, -2, "header");
 
         /*  }}} */
     }
@@ -1231,3 +1296,227 @@ ngx_http_lua_inject_subrequest_api(lua_State *L)
     lua_setfield(L, -2, "location");
 }
 
+
+static ngx_int_t
+ngx_http_lua_subrequest(ngx_http_request_t *r,
+    ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr,
+    ngx_http_post_subrequest_t *ps, ngx_uint_t flags)
+{
+    ngx_time_t                    *tp;
+    ngx_connection_t              *c;
+    ngx_http_request_t            *sr;
+    ngx_http_core_srv_conf_t      *cscf;
+
+    r->main->subrequests--;
+
+    if (r->main->subrequests == 0) {
+#if defined(NGX_DTRACE) && NGX_DTRACE
+        ngx_http_probe_subrequest_cycle(r, uri, args);
+#endif
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "subrequests cycle while processing \"%V\"", uri);
+        r->main->subrequests = 1;
+        return NGX_ERROR;
+    }
+
+    sr = ngx_pcalloc(r->pool, sizeof(ngx_http_request_t));
+    if (sr == NULL) {
+        return NGX_ERROR;
+    }
+
+    sr->signature = NGX_HTTP_MODULE;
+
+    c = r->connection;
+    sr->connection = c;
+
+    sr->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
+    if (sr->ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_list_init(&sr->headers_out.headers, r->pool, 20,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+    sr->main_conf = cscf->ctx->main_conf;
+    sr->srv_conf = cscf->ctx->srv_conf;
+    sr->loc_conf = cscf->ctx->loc_conf;
+
+    sr->pool = r->pool;
+
+    sr->headers_in = r->headers_in;
+
+    ngx_http_clear_content_length(sr);
+    ngx_http_clear_accept_ranges(sr);
+    ngx_http_clear_last_modified(sr);
+
+    sr->request_body = r->request_body;
+
+#ifdef HAVE_ALLOW_REQUEST_BODY_UPDATING_PATCH
+    sr->content_length_n = -1;
+#endif
+
+    sr->method = NGX_HTTP_GET;
+    sr->http_version = r->http_version;
+
+    sr->request_line = r->request_line;
+    sr->uri = *uri;
+
+    if (args) {
+        sr->args = *args;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http subrequest \"%V?%V\"", uri, &sr->args);
+
+    sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0;
+    sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0;
+
+    sr->unparsed_uri = r->unparsed_uri;
+    sr->method_name = ngx_http_core_get_method;
+    sr->http_protocol = r->http_protocol;
+
+    ngx_http_set_exten(sr);
+
+    sr->main = r->main;
+    sr->parent = r;
+    sr->post_subrequest = ps;
+    sr->read_event_handler = ngx_http_request_empty_handler;
+    sr->write_event_handler = ngx_http_handler;
+
+    sr->variables = r->variables;
+
+    sr->log_handler = r->log_handler;
+
+    sr->internal = 1;
+
+    sr->discard_body = r->discard_body;
+    sr->expect_tested = 1;
+    sr->main_filter_need_in_memory = r->main_filter_need_in_memory;
+
+    sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
+
+    tp = ngx_timeofday();
+    sr->start_sec = tp->sec;
+    sr->start_msec = tp->msec;
+
+    r->main->count++;
+
+    *psr = sr;
+
+#if defined(NGX_DTRACE) && NGX_DTRACE
+    ngx_http_probe_subrequest_start(sr);
+#endif
+
+    return ngx_http_post_request(sr, NULL);
+}
+
+
+static ngx_int_t
+ngx_http_lua_subrequest_resume(ngx_http_request_t *r)
+{
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run subrequests done, resuming lua thread");
+
+    coctx = ctx->cur_co_ctx;
+
+    dd("nsubreqs: %d", (int) coctx->nsubreqs);
+
+    ngx_http_lua_handle_subreq_responses(r, ctx);
+
+    dd("free sr_statues/headers/bodies memory ASAP");
+
+#if 1
+    ngx_pfree(r->pool, coctx->sr_statuses);
+
+    coctx->sr_statuses = NULL;
+    coctx->sr_headers = NULL;
+    coctx->sr_bodies = NULL;
+#endif
+
+    c = r->connection;
+
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, coctx->nsubreqs);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    /* rc == NGX_ERROR || rc >= NGX_OK */
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_cancel_subreq(ngx_http_request_t *r)
+{
+    ngx_http_posted_request_t   *pr;
+    ngx_http_posted_request_t  **p;
+
+#if 1
+    r->main->count--;
+    r->main->subrequests++;
+#endif
+
+    p = &r->main->posted_requests;
+    for (pr = r->main->posted_requests; pr->next; pr = pr->next) {
+        p = &pr->next;
+    }
+
+    *p = NULL;
+
+    r->connection->data = r->parent;
+}
+
+
+static ngx_int_t
+ngx_http_post_request_to_head(ngx_http_request_t *r)
+{
+    ngx_http_posted_request_t  *pr;
+
+    pr = ngx_palloc(r->pool, sizeof(ngx_http_posted_request_t));
+    if (pr == NULL) {
+        return NGX_ERROR;
+    }
+
+    pr->request = r;
+    pr->next = r->main->posted_requests;
+    r->main->posted_requests = pr;
+
+    return NGX_OK;
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.h b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.h
index fd40933..65ef2d4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.h
@@ -6,11 +6,24 @@
 
 
 void ngx_http_lua_inject_subrequest_api(lua_State *L);
-void ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx);
 ngx_int_t ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data,
         ngx_int_t rc);
 
 
+extern ngx_str_t  ngx_http_lua_get_method;
+extern ngx_str_t  ngx_http_lua_put_method;
+extern ngx_str_t  ngx_http_lua_post_method;
+extern ngx_str_t  ngx_http_lua_head_method;
+extern ngx_str_t  ngx_http_lua_delete_method;
+extern ngx_str_t  ngx_http_lua_options_method;
+
+
+typedef struct ngx_http_lua_post_subrequest_data_s {
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *pr_co_ctx;
+
+} ngx_http_lua_post_subrequest_data_t;
+
+
 #endif /* NGX_HTTP_LUA_SUBREQUEST_H */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_time.c b/debian/modules/nginx-lua/src/ngx_http_lua_time.c
index 9997166..e652259 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_time.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_time.c
@@ -4,6 +4,7 @@
 #include "ddebug.h"
 
 #include "ngx_http_lua_time.h"
+#include "ngx_http_lua_util.h"
 
 
 static int ngx_http_lua_ngx_today(lua_State *L);
@@ -15,6 +16,7 @@ static int ngx_http_lua_ngx_cookie_time(lua_State *L);
 static int ngx_http_lua_ngx_http_time(lua_State *L);
 static int ngx_http_lua_ngx_parse_http_time(lua_State *L);
 static int ngx_http_lua_ngx_update_time(lua_State *L);
+static int ngx_http_lua_ngx_req_start_time(lua_State *L);
 
 
 static int
@@ -175,6 +177,25 @@ ngx_http_lua_ngx_parse_http_time(lua_State *L)
 }
 
 
+static int
+ngx_http_lua_ngx_req_start_time(lua_State *L)
+{
+    ngx_http_request_t  *r;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    lua_pushnumber(L, (lua_Number) (r->start_sec + r->start_msec / 1000.0L));
+    return 1;
+}
+
+
 void
 ngx_http_lua_inject_time_api(lua_State *L)
 {
@@ -211,7 +232,15 @@ ngx_http_lua_inject_time_api(lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_ngx_http_time);
     lua_setfield(L, -2, "http_time");
 
-	lua_pushcfunction(L, ngx_http_lua_ngx_parse_http_time);
+    lua_pushcfunction(L, ngx_http_lua_ngx_parse_http_time);
     lua_setfield(L, -2, "parse_http_time");
 }
 
+
+void
+ngx_http_lua_inject_req_time_api(lua_State *L)
+{
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_start_time);
+    lua_setfield(L, -2, "start_time");
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_time.h b/debian/modules/nginx-lua/src/ngx_http_lua_time.h
index 2ed5386..db43d13 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_time.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_time.h
@@ -6,7 +6,7 @@
 
 
 void ngx_http_lua_inject_time_api(lua_State *L);
+void ngx_http_lua_inject_req_time_api(lua_State *L);
 
 
 #endif /* NGX_HTTP_LUA_TIME_H */
-
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uri.c b/debian/modules/nginx-lua/src/ngx_http_lua_uri.c
index 2f113c0..6fb913d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_uri.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_uri.c
@@ -13,29 +13,8 @@ static int ngx_http_lua_ngx_req_set_uri(lua_State *L);
 void
 ngx_http_lua_inject_req_uri_api(ngx_log_t *log, lua_State *L)
 {
-#if 1
-    ngx_int_t         rc;
-#endif
-
     lua_pushcfunction(L, ngx_http_lua_ngx_req_set_uri);
-    lua_setfield(L, -2, "_set_uri");
-
-#if 1
-    {
-        const char    buf[] = "ngx.req._set_uri(...) ngx._check_aborted()";
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "ngx.req.set_uri");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx.req.set_uri(): %i",
-                      rc);
-
-    } else {
-        lua_setfield(L, -2, "set_uri");
-    }
-#endif
+    lua_setfield(L, -2, "set_uri");
 }
 
 
@@ -55,13 +34,35 @@ ngx_http_lua_ngx_req_set_uri(lua_State *L)
         return luaL_error(L, "expecting 1 argument but seen %d", n);
     }
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
     if (n == 2) {
+
         luaL_checktype(L, 2, LUA_TBOOLEAN);
         jump = lua_toboolean(L, 2);
+
+        if (jump) {
+
+            ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+            if (ctx == NULL) {
+                return luaL_error(L, "no ctx found");
+            }
+
+            dd("rewrite: %d, access: %d, content: %d",
+                    (int) ctx->entered_rewrite_phase,
+                    (int) ctx->entered_access_phase,
+                    (int) ctx->entered_content_phase);
+
+            ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua set uri jump to \"%V\"", &r->uri);
+
+            ngx_http_lua_check_if_abortable(L, ctx);
+        }
     }
 
     p = (u_char *) luaL_checklstring(L, 1, &len);
@@ -85,32 +86,9 @@ ngx_http_lua_ngx_req_set_uri(lua_State *L)
     ngx_http_set_exten(r);
 
     if (jump) {
+        r->uri_changed = 1;
 
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-#if defined(DDEBUG) && DDEBUG
-        if (ctx) {
-            dd("rewrite: %d, access: %d, content: %d",
-                    (int) ctx->entered_rewrite_phase,
-                    (int) ctx->entered_access_phase,
-                    (int) ctx->entered_content_phase);
-        }
-#endif
-
-        if (ctx && ctx->entered_rewrite_phase
-            && !ctx->entered_access_phase
-            && !ctx->entered_content_phase)
-        {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua set uri jump to \"%V\"", &r->uri);
-
-            r->uri_changed = 1;
-            return lua_yield(L, 0);
-        }
-
-        return luaL_error(L, "attempt to call ngx.req.set_uri to do "
-                "location jump in contexts other than rewrite_by_lua and "
-                "rewrite_by_lua_file");
+        return lua_yield(L, 0);
     }
 
     r->valid_location = 0;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c b/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
new file mode 100644
index 0000000..2532076
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
@@ -0,0 +1,184 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_uthread.h"
+#include "ngx_http_lua_coroutine.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_probe.h"
+
+
+#if 1
+#undef ngx_http_lua_probe_info
+#define ngx_http_lua_probe_info(msg)
+#endif
+
+
+static int ngx_http_lua_uthread_spawn(lua_State *L);
+static int ngx_http_lua_uthread_wait(lua_State *L);
+
+
+void
+ngx_http_lua_inject_uthread_api(ngx_log_t *log, lua_State *L)
+{
+    /* new thread table */
+    lua_newtable(L);
+
+    lua_pushcfunction(L, ngx_http_lua_uthread_spawn);
+    lua_setfield(L, -2, "spawn");
+
+    lua_pushcfunction(L, ngx_http_lua_uthread_wait);
+    lua_setfield(L, -2, "wait");
+
+    lua_setfield(L, -2, "thread");
+}
+
+
+static int
+ngx_http_lua_uthread_spawn(lua_State *L)
+{
+    int                           n;
+    ngx_http_request_t           *r;
+    ngx_http_lua_ctx_t           *ctx;
+    ngx_http_lua_co_ctx_t        *coctx = NULL;
+
+    n = lua_gettop(L);
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
+
+    /* anchor the newly created coroutine into the Lua registry */
+
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_pushvalue(L, -2);
+    coctx->co_ref = luaL_ref(L, -2);
+    lua_pop(L, 1);
+
+    if (n > 1) {
+        lua_replace(L, 1);
+        lua_xmove(L, coctx->co, n - 1);
+    }
+
+    coctx->is_uthread = 1;
+    ctx->uthreads++;
+
+    coctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+    ctx->co_op = NGX_HTTP_LUA_USER_THREAD_RESUME;
+
+    ctx->cur_co_ctx->thread_spawn_yielded = 1;
+
+    if (ngx_http_lua_post_thread(r, ctx, ctx->cur_co_ctx) != NGX_OK) {
+        return luaL_error(L, "out of memory");
+    }
+
+    coctx->parent_co_ctx = ctx->cur_co_ctx;
+    ctx->cur_co_ctx = coctx;
+
+    ngx_http_lua_probe_user_thread_spawn(r, L, coctx->co);
+
+    return lua_yield(L, 1);
+}
+
+
+static int
+ngx_http_lua_uthread_wait(lua_State *L)
+{
+    int                          i, nargs, nrets;
+    lua_State                   *sub_co;
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx, *sub_coctx;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT);
+
+    coctx = ctx->cur_co_ctx;
+
+    nargs = lua_gettop(L);
+
+    for (i = 1; i <= nargs; i++) {
+        sub_co = lua_tothread(L, i);
+
+        luaL_argcheck(L, sub_co, i, "lua thread expected");
+
+        sub_coctx = ngx_http_lua_get_co_ctx(sub_co, ctx);
+        if (sub_coctx == NULL) {
+            return luaL_error(L, "no co ctx found for the ngx.thread "
+                              "instance given");
+        }
+
+        if (!sub_coctx->is_uthread) {
+            return luaL_error(L, "attempt to wait on a coroutine that is "
+                              "not a user thread");
+        }
+
+        if (sub_coctx->parent_co_ctx != coctx) {
+            return luaL_error(L, "only the parent coroutine can wait on the "
+                              "thread");
+        }
+
+        switch (sub_coctx->co_status) {
+        case NGX_HTTP_LUA_CO_ZOMBIE:
+
+            ngx_http_lua_probe_info("found zombie child");
+
+            nrets = lua_gettop(sub_coctx->co);
+
+            dd("child retval count: %d, %s: %s", n,
+                    luaL_typename(sub_coctx->co, -1),
+                    lua_tostring(sub_coctx->co, -1));
+
+            if (nrets) {
+                lua_xmove(sub_coctx->co, L, nrets);
+            }
+
+#if 1
+            ngx_http_lua_del_thread(r, L, ctx, sub_coctx);
+            ctx->uthreads--;
+#endif
+
+            return nrets;
+
+        default:
+            /* still alive */
+            break;
+        }
+
+        ngx_http_lua_probe_user_thread_wait(L, sub_coctx->co);
+        sub_coctx->waited_by_parent = 1;
+    }
+
+    return lua_yield(L, 0);
+}
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uthread.h b/debian/modules/nginx-lua/src/ngx_http_lua_uthread.h
new file mode 100644
index 0000000..a7ab67a
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_uthread.h
@@ -0,0 +1,29 @@
+#ifndef NGX_HTTP_LUA_UTHREAD_H
+#define NGX_HTTP_LUA_UTHREAD_H
+
+
+#include "ngx_http_lua_common.h"
+
+
+#define ngx_http_lua_is_thread(ctx)                                          \
+    ((ctx)->cur_co_ctx->is_uthread || (ctx)->cur_co_ctx == &(ctx)->entry_co_ctx)
+
+
+#define ngx_http_lua_is_entry_thread(ctx)                                    \
+    ((ctx)->cur_co_ctx == &(ctx)->entry_co_ctx)
+
+
+#define ngx_http_lua_entry_thread_alive(ctx)                                 \
+    ((ctx)->entry_co_ctx.co_ref != LUA_NOREF)
+
+
+#define ngx_http_lua_coroutine_alive(coctx)                                  \
+    ((coctx)->co_status != NGX_HTTP_LUA_CO_DEAD                              \
+     && (coctx)->co_status != NGX_HTTP_LUA_CO_ZOMBIE)
+
+
+void ngx_http_lua_inject_uthread_api(ngx_log_t *log, lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_UTHREAD_H */
+
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_util.c b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
index d20681e..1636197 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
@@ -7,6 +7,7 @@
 
 
 #include "nginx.h"
+#include "ngx_http_lua_directive.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_exception.h"
 #include "ngx_http_lua_pcrefix.h"
@@ -25,25 +26,68 @@
 #include "ngx_http_lua_string.h"
 #include "ngx_http_lua_misc.h"
 #include "ngx_http_lua_consts.h"
+#include "ngx_http_lua_req_method.h"
 #include "ngx_http_lua_shdict.h"
-#include "ngx_http_lua_socket.h"
+#include "ngx_http_lua_coroutine.h"
+#include "ngx_http_lua_socket_tcp.h"
+#include "ngx_http_lua_socket_udp.h"
+#include "ngx_http_lua_sleep.h"
+#include "ngx_http_lua_setby.h"
+#include "ngx_http_lua_headerfilterby.h"
+#include "ngx_http_lua_bodyfilterby.h"
+#include "ngx_http_lua_logby.h"
+#include "ngx_http_lua_phase.h"
+#include "ngx_http_lua_probe.h"
+#include "ngx_http_lua_uthread.h"
+#include "ngx_http_lua_contentby.h"
+
+
+#if 1
+#undef ngx_http_lua_probe_info
+#define ngx_http_lua_probe_info(msg)
+#endif
+
+
+char ngx_http_lua_code_cache_key;
+char ngx_http_lua_ctx_tables_key;
+char ngx_http_lua_regex_cache_key;
+char ngx_http_lua_socket_pool_key;
+char ngx_http_lua_request_key;
+char ngx_http_lua_coroutines_key;
+char ngx_http_lua_req_get_headers_metatable_key;
 
 
 static ngx_int_t ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx);
-static void init_ngx_lua_registry(ngx_conf_t *cf, lua_State *L);
-static void init_ngx_lua_globals(ngx_conf_t *cf, lua_State *L);
+    ngx_http_lua_ctx_t *ctx);
+static void ngx_http_lua_init_registry(ngx_conf_t *cf, lua_State *L);
+static void ngx_http_lua_init_globals(ngx_conf_t *cf, lua_State *L);
 static void ngx_http_lua_set_path(ngx_conf_t *cf, lua_State *L, int tab_idx,
-        const char *fieldname, const char *path, const char *default_path);
+    const char *fieldname, const char *path, const char *default_path);
 static ngx_int_t ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx, int cc_ref);
+    ngx_http_lua_ctx_t *ctx);
 static ngx_int_t ngx_http_lua_handle_exit(lua_State *L, ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx, int cc_ref);
+    ngx_http_lua_ctx_t *ctx);
 static ngx_int_t ngx_http_lua_handle_rewrite_jump(lua_State *L,
-    ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx, int cc_ref);
-static int ngx_http_lua_ngx_check_aborted(lua_State *L);
-
-static int debug_traceback(lua_State *L, lua_State *L1);
+    ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx);
+static int ngx_http_lua_thread_traceback(lua_State *L, lua_State *co,
+    ngx_http_lua_co_ctx_t *coctx);
+static void ngx_http_lua_inject_ngx_api(ngx_conf_t *cf, lua_State *L);
+static void ngx_http_lua_inject_arg_api(lua_State *L);
+static int ngx_http_lua_param_get(lua_State *L);
+static int ngx_http_lua_param_set(lua_State *L);
+static void ngx_http_lua_del_all_threads(ngx_http_request_t *r, lua_State *L,
+    ngx_http_lua_ctx_t *ctx);
+static ngx_int_t ngx_http_lua_output_filter(ngx_http_request_t *r,
+    ngx_chain_t *in);
+static ngx_int_t ngx_http_lua_send_special(ngx_http_request_t *r,
+    ngx_uint_t flags);
+static void ngx_http_lua_finalize_coroutines(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx);
+static ngx_int_t ngx_http_lua_post_zombie_thread(ngx_http_request_t *r,
+    ngx_http_lua_co_ctx_t *parent, ngx_http_lua_co_ctx_t *thread);
+static void ngx_http_lua_cleanup_zombie_child_uthreads(ngx_http_request_t *r,
+    lua_State *L, ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t *coctx);
+static ngx_int_t ngx_http_lua_on_abort_resume(ngx_http_request_t *r);
 
 
 #ifndef LUA_PATH_SEP
@@ -54,14 +98,14 @@ static int debug_traceback(lua_State *L, lua_State *L1);
 
 
 enum {
-    LEVELS1	= 12,       /* size of the first part of the stack */
-    LEVELS2	= 10        /* size of the second part of the stack */
+    LEVELS1 = 12,       /* size of the first part of the stack */
+    LEVELS2 = 10        /* size of the second part of the stack */
 };
 
 
 static void
 ngx_http_lua_set_path(ngx_conf_t *cf, lua_State *L, int tab_idx,
-        const char *fieldname, const char *path, const char *default_path)
+    const char *fieldname, const char *path, const char *default_path)
 {
     const char          *tmp_path;
     const char          *prefix;
@@ -78,10 +122,17 @@ ngx_http_lua_set_path(ngx_conf_t *cf, lua_State *L, int tab_idx,
 
     dd("tmp_path path: %s", tmp_path);
 
-    tmp_path = luaL_gsub(L, tmp_path, AUX_MARK, default_path);
+#if (NGX_DEBUG)
+    tmp_path =
+#else
+    (void)
+#endif
+        luaL_gsub(L, tmp_path, AUX_MARK, default_path);
 
+#if (NGX_DEBUG)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-            "lua setting lua package.%s to \"%s\"", fieldname, tmp_path);
+                   "lua setting lua package.%s to \"%s\"", fieldname, tmp_path);
+#endif
 
     lua_remove(L, -2);
 
@@ -91,6 +142,22 @@ ngx_http_lua_set_path(ngx_conf_t *cf, lua_State *L, int tab_idx,
 }
 
 
+/**
+ * Create new table and set _G field to itself.
+ *
+ * After:
+ *         | new table | <- top
+ *         |    ...    |
+ * */
+void
+ngx_http_lua_create_new_global_table(lua_State *L, int narr, int nrec)
+{
+    lua_createtable(L, narr, nrec + 1);
+    lua_pushvalue(L, -1);
+    lua_setfield(L, -2, "_G");
+}
+
+
 lua_State *
 ngx_http_lua_new_state(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
 {
@@ -115,14 +182,15 @@ ngx_http_lua_new_state(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
 
     if (!lua_istable(L, -1)) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                "the \"package\" table does not exist");
+                           "the \"package\" table does not exist");
         return NULL;
     }
 
 #ifdef LUA_DEFAULT_PATH
 #   define LUA_DEFAULT_PATH_LEN (sizeof(LUA_DEFAULT_PATH) - 1)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-            "lua prepending default package.path with %s", LUA_DEFAULT_PATH);
+                   "lua prepending default package.path with %s",
+                   LUA_DEFAULT_PATH);
 
     lua_pushliteral(L, LUA_DEFAULT_PATH ";"); /* package default */
     lua_getfield(L, -2, "path"); /* package default old */
@@ -134,7 +202,8 @@ ngx_http_lua_new_state(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
 #ifdef LUA_DEFAULT_CPATH
 #   define LUA_DEFAULT_CPATH_LEN (sizeof(LUA_DEFAULT_CPATH) - 1)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-            "lua prepending default package.cpath with %s", LUA_DEFAULT_CPATH);
+                   "lua prepending default package.cpath with %s",
+                   LUA_DEFAULT_CPATH);
 
     lua_pushliteral(L, LUA_DEFAULT_CPATH ";"); /* package default */
     lua_getfield(L, -2, "cpath"); /* package default old */
@@ -174,8 +243,8 @@ ngx_http_lua_new_state(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
 
     lua_remove(L, -1); /* remove the "package" table */
 
-    init_ngx_lua_registry(cf, L);
-    init_ngx_lua_globals(cf, L);
+    ngx_http_lua_init_registry(cf, L);
+    ngx_http_lua_init_globals(cf, L);
 
     return L;
 }
@@ -184,67 +253,165 @@ ngx_http_lua_new_state(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
 lua_State *
 ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 {
-    int              top;
-    lua_State       *cr;
+    int              base;
+    lua_State       *co;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua creating new thread");
+                   "lua creating new thread");
 
-    top = lua_gettop(L);
+    base = lua_gettop(L);
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_CORT_REF);
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
 
-    cr = lua_newthread(L);
+    co = lua_newthread(L);
 
-    if (cr) {
-        /*  new globals table for coroutine */
-        lua_newtable(cr);
+    /*  {{{ inherit coroutine's globals to main thread's globals table
+     *  for print() function will try to find tostring() in current
+     *  globals table.
+     */
+    /*  new globals table for coroutine */
+    ngx_http_lua_create_new_global_table(co, 0, 0);
 
-        /*  {{{ inherit coroutine's globals to main thread's globals table
-         *  for print() function will try to find tostring() in current
-         *  globals *  table. */
-        lua_createtable(cr, 0, 1);
-        lua_pushvalue(cr, LUA_GLOBALSINDEX);
-        lua_setfield(cr, -2, "__index");
-        lua_setmetatable(cr, -2);
-        /*  }}} */
+    lua_createtable(co, 0, 1);
+    lua_pushvalue(co, LUA_GLOBALSINDEX);
+    lua_setfield(co, -2, "__index");
+    lua_setmetatable(co, -2);
 
-        lua_replace(cr, LUA_GLOBALSINDEX);
+    lua_replace(co, LUA_GLOBALSINDEX);
+    /*  }}} */
 
-        *ref = luaL_ref(L, -2);
+    *ref = luaL_ref(L, -2);
 
-        if (*ref == LUA_NOREF) {
-            lua_settop(L, top);  /* restore main thread stack */
-            return NULL;
-        }
+    if (*ref == LUA_NOREF) {
+        lua_settop(L, base);  /* restore main thread stack */
+        return NULL;
     }
 
-    /*  pop coroutine reference on main thread's stack after anchoring it
-     *  in registry */
-    lua_pop(L, 1);
-
-    return cr;
+    lua_settop(L, base);
+    return co;
 }
 
 
 void
-ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L, int ref)
+ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t *coctx)
 {
+    if (coctx->co_ref == LUA_NOREF) {
+        return;
+    }
+
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua deleting thread");
+                   "lua deleting light thread");
 
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_CORT_REF);
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+
+    ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
+
+    luaL_unref(L, -1, coctx->co_ref);
+    coctx->co_ref = LUA_NOREF;
+    coctx->co_status = NGX_HTTP_LUA_CO_DEAD;
 
-    /* release reference to coroutine */
-    luaL_unref(L, -1, ref);
     lua_pop(L, 1);
 }
 
 
-ngx_int_t
-ngx_http_lua_has_inline_var(ngx_str_t *s)
+static void
+ngx_http_lua_del_all_threads(ngx_http_request_t *r, lua_State *L,
+    ngx_http_lua_ctx_t *ctx)
 {
-    return (ngx_http_script_variables_count(s) != 0);
+    int                              inited = 0;
+    int                              ref;
+    ngx_uint_t                       i;
+    ngx_list_part_t                 *part;
+    ngx_http_lua_co_ctx_t           *entry_coctx;
+    ngx_http_lua_co_ctx_t           *cc;
+
+    cc = ctx->on_abort_co_ctx;
+    if (cc) {
+        lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+        inited = 1;
+
+        if (cc->co_ref != LUA_NOREF) {
+            ngx_http_lua_probe_thread_delete(r, cc->co, ctx);
+
+            luaL_unref(L, -1, cc->co_ref);
+            cc->co_ref = LUA_NOREF;
+
+            if (cc->co_status != NGX_HTTP_LUA_CO_SUSPENDED) {
+                ctx->uthreads--;
+            }
+
+            cc->co_status = NGX_HTTP_LUA_CO_DEAD;
+        }
+
+        ctx->on_abort_co_ctx = NULL;
+    }
+
+    if (ctx->uthreads && ctx->user_co_ctx) {
+        /* release all pending user threads */
+
+        if (!inited) {
+            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+            lua_rawget(L, LUA_REGISTRYINDEX);
+            inited = 1;
+        }
+
+        part = &ctx->user_co_ctx->part;
+        cc = part->elts;
+
+        for (i = 0; /* void */; i++) {
+
+            if (i >= part->nelts) {
+                if (part->next == NULL) {
+                    break;
+                }
+
+                part = part->next;
+                cc = part->elts;
+                i = 0;
+            }
+
+            ref = cc[i].co_ref;
+
+            if (ref != LUA_NOREF) {
+                ngx_http_lua_probe_thread_delete(r, cc[i].co, ctx);
+
+                luaL_unref(L, -1, ref);
+                cc[i].co_ref = LUA_NOREF;
+                cc[i].co_status = NGX_HTTP_LUA_CO_DEAD;
+                ctx->uthreads--;
+
+                if (ctx->uthreads == 0) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /* release the reference to the entry thread */
+
+    entry_coctx = &ctx->entry_co_ctx;
+
+    if (entry_coctx->co_ref != LUA_NOREF) {
+        if (!inited) {
+            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+            lua_rawget(L, LUA_REGISTRYINDEX);
+            inited = 1;
+        }
+
+        ngx_http_lua_probe_thread_delete(r, entry_coctx->co, ctx);
+
+        luaL_unref(L, -1, entry_coctx->co_ref);
+        entry_coctx->co_ref = LUA_NOREF;
+        entry_coctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+    }
+
+    if (inited) {
+        lua_pop(L, 1);
+    }
 }
 
 
@@ -287,11 +454,11 @@ ngx_http_lua_rebase_path(ngx_pool_t *pool, u_char *src, size_t len)
 
 ngx_int_t
 ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx)
+    ngx_http_lua_ctx_t *ctx)
 {
     ngx_int_t            rc;
 
-    if (!ctx->headers_sent ) {
+    if (!ctx->headers_sent) {
         if (r->headers_out.status == 0) {
             r->headers_out.status = NGX_HTTP_OK;
         }
@@ -319,7 +486,7 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
 
 ngx_int_t
 ngx_http_lua_send_chain_link(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
-        ngx_chain_t *in)
+    ngx_chain_t *in)
 {
     ngx_int_t                     rc;
     ngx_chain_t                  *cl;
@@ -372,7 +539,8 @@ ngx_http_lua_send_chain_link(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
             }
 
             if (ctx->out) {
-                rc = ngx_http_output_filter(r, ctx->out);
+
+                rc = ngx_http_lua_output_filter(r, ctx->out);
 
                 if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
                     return rc;
@@ -395,9 +563,10 @@ ngx_http_lua_send_chain_link(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
         ctx->eof = 1;
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua sending last buf of the response body");
+                       "lua sending last buf of the response body");
+
+        rc = ngx_http_lua_send_special(r, NGX_HTTP_LAST);
 
-        rc = ngx_http_send_special(r, NGX_HTTP_LAST);
         if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
             return rc;
         }
@@ -409,7 +578,7 @@ ngx_http_lua_send_chain_link(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
 
     if (ctx->buffering) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua buffering output bufs for the HTTP 1.0 request");
+                       "lua buffering output bufs for the HTTP 1.0 request");
 
         for (cl = ctx->out, ll = &ctx->out; cl; cl = cl->next) {
             ll = &cl->next;
@@ -420,13 +589,57 @@ ngx_http_lua_send_chain_link(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
         return NGX_OK;
     }
 
+    return ngx_http_lua_output_filter(r, in);
+}
+
+
+static ngx_int_t
+ngx_http_lua_send_special(ngx_http_request_t *r, ngx_uint_t flags)
+{
+    ngx_int_t            rc;
+    ngx_http_request_t  *ar; /* active request */
+
+    ar = r->connection->data;
+
+    if (ar != r) {
+
+        /* bypass ngx_http_postpone_filter_module */
+
+        r->connection->data = r;
+        rc = ngx_http_send_special(r, flags);
+        r->connection->data = ar;
+        return rc;
+    }
+
+    return ngx_http_send_special(r, flags);
+}
+
+
+static ngx_int_t
+ngx_http_lua_output_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_int_t            rc;
+    ngx_http_request_t  *ar; /* active request */
+
+    ar = r->connection->data;
+
+    if (ar != r) {
+
+        /* bypass ngx_http_postpone_filter_module */
+
+        r->connection->data = r;
+        rc = ngx_http_output_filter(r, in);
+        r->connection->data = ar;
+        return rc;
+    }
+
     return ngx_http_output_filter(r, in);
 }
 
 
 static ngx_int_t
 ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx)
+    ngx_http_lua_ctx_t *ctx)
 {
     size_t               size;
     ngx_chain_t         *cl;
@@ -437,7 +650,7 @@ ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua sending HTTP 1.0 response headers");
+                   "lua sending HTTP 1.0 response headers");
 
     if (r->header_only) {
         goto send;
@@ -463,59 +676,72 @@ send:
 
 
 static void
-init_ngx_lua_registry(ngx_conf_t *cf, lua_State *L)
+ngx_http_lua_init_registry(ngx_conf_t *cf, lua_State *L)
 {
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-            "lua initializing lua registry");
+                   "lua initializing lua registry");
 
     /* {{{ register a table to anchor lua coroutines reliably:
      * {([int]ref) = [cort]} */
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_newtable(L);
-    lua_setfield(L, LUA_REGISTRYINDEX, NGX_LUA_CORT_REF);
+    lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
 
     /* create the registry entry for the Lua request ctx data table */
+    lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
     lua_newtable(L);
-    lua_setfield(L, LUA_REGISTRYINDEX, NGX_LUA_REQ_CTX_REF);
+    lua_rawset(L, LUA_REGISTRYINDEX);
 
     /* create the registry entry for the Lua socket connection pool table */
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_newtable(L);
-    lua_setfield(L, LUA_REGISTRYINDEX, NGX_LUA_SOCKET_POOL);
+    lua_rawset(L, LUA_REGISTRYINDEX);
 
+#if (NGX_PCRE)
     /* create the registry entry for the Lua precompiled regex object cache */
+    lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
     lua_newtable(L);
-    lua_setfield(L, LUA_REGISTRYINDEX, NGX_LUA_REGEX_CACHE);
+    lua_rawset(L, LUA_REGISTRYINDEX);
+#endif
 
     /* {{{ register table to cache user code:
-     * {([string]cache_key) = [code closure]} */
+     * { [(string)cache_key] = <code closure> } */
+    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
     lua_newtable(L);
-    lua_setfield(L, LUA_REGISTRYINDEX, LUA_CODE_CACHE_KEY);
+    lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
+
+    lua_pushlightuserdata(L, &ngx_http_lua_cf_log_key);
+    lua_pushlightuserdata(L, cf->log);
+    lua_rawset(L, LUA_REGISTRYINDEX);
 }
 
 
 static void
-init_ngx_lua_globals(ngx_conf_t *cf, lua_State *L)
+ngx_http_lua_init_globals(ngx_conf_t *cf, lua_State *L)
 {
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-            "lua initializing lua globals");
-
-    /* {{{ remove unsupported globals */
-    lua_pushnil(L);
-    lua_setfield(L, LUA_GLOBALSINDEX, "coroutine");
-    /* }}} */
+                   "lua initializing lua globals");
 
 #if defined(NDK) && NDK
     ngx_http_lua_inject_ndk_api(L);
 #endif /* defined(NDK) && NDK */
 
-    lua_createtable(L, 0 /* narr */, 88 /* nrec */);    /* ngx.* */
+    ngx_http_lua_inject_ngx_api(cf, L);
+}
 
-    ngx_http_lua_inject_internal_utils(cf->log, L);
+
+static void
+ngx_http_lua_inject_ngx_api(ngx_conf_t *cf, lua_State *L)
+{
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+
+    lua_createtable(L, 0 /* narr */, 85 /* nrec */);    /* ngx.* */
+
+    ngx_http_lua_inject_arg_api(L);
 
     ngx_http_lua_inject_http_consts(L);
     ngx_http_lua_inject_core_consts(L);
@@ -526,14 +752,20 @@ init_ngx_lua_globals(ngx_conf_t *cf, lua_State *L)
     ngx_http_lua_inject_string_api(L);
     ngx_http_lua_inject_control_api(cf->log, L);
     ngx_http_lua_inject_subrequest_api(L);
+    ngx_http_lua_inject_sleep_api(L);
+    ngx_http_lua_inject_phase_api(L);
+
 #if (NGX_PCRE)
     ngx_http_lua_inject_regex_api(L);
 #endif
+
     ngx_http_lua_inject_req_api(cf->log, L);
     ngx_http_lua_inject_resp_header_api(L);
     ngx_http_lua_inject_variable_api(L);
     ngx_http_lua_inject_shdict_api(lmcf, L);
-    ngx_http_lua_inject_socket_api(cf->log, L);
+    ngx_http_lua_inject_socket_tcp_api(cf->log, L);
+    ngx_http_lua_inject_socket_udp_api(cf->log, L);
+    ngx_http_lua_inject_uthread_api(cf->log, L);
 
     ngx_http_lua_inject_misc_api(L);
 
@@ -544,6 +776,8 @@ init_ngx_lua_globals(ngx_conf_t *cf, lua_State *L)
     lua_pop(L, 2);
 
     lua_setglobal(L, "ngx");
+
+    ngx_http_lua_inject_coroutine_api(cf->log, L);
 }
 
 
@@ -561,7 +795,7 @@ ngx_http_lua_discard_bufs(ngx_pool_t *pool, ngx_chain_t *in)
 
 ngx_int_t
 ngx_http_lua_add_copy_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
-        ngx_chain_t **chain, ngx_chain_t *in)
+    ngx_chain_t **chain, ngx_chain_t *in)
 {
     ngx_chain_t     *cl, **ll;
     size_t           len;
@@ -615,18 +849,21 @@ ngx_http_lua_add_copy_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
 
 void
 ngx_http_lua_reset_ctx(ngx_http_request_t *r, lua_State *L,
-        ngx_http_lua_ctx_t *ctx)
+    ngx_http_lua_ctx_t *ctx)
 {
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua reset ctx");
+                   "lua reset ctx");
 
-    if (ctx->cc_ref != LUA_NOREF) {
-        ngx_http_lua_del_thread(r, L, ctx->cc_ref);
-        ctx->cc_ref = LUA_NOREF;
+    ngx_http_lua_del_all_threads(r, L, ctx);
+
+    if (ctx->user_co_ctx) {
+        /* no way to destroy a list but clean up the whole pool */
+        ctx->user_co_ctx = NULL;
     }
 
-    ctx->waiting = 0;
-    ctx->done = 0;
+    ngx_memzero(&ctx->entry_co_ctx, sizeof(ngx_http_lua_co_ctx_t));
+
+    ctx->entry_co_ctx.co_ref = LUA_NOREF;
 
     ctx->entered_rewrite_phase = 0;
     ctx->entered_access_phase = 0;
@@ -634,14 +871,12 @@ ngx_http_lua_reset_ctx(ngx_http_request_t *r, lua_State *L,
 
     ctx->exit_code = 0;
     ctx->exited = 0;
-    ctx->exec_uri.data = NULL;
-    ctx->exec_uri.len = 0;
+    ctx->resume_handler = ngx_http_lua_wev_handler;
 
-    ctx->sr_statuses = NULL;
-    ctx->sr_headers = NULL;
-    ctx->sr_bodies = NULL;
+    ngx_str_null(&ctx->exec_uri);
+    ngx_str_null(&ctx->exec_args);
 
-    ctx->aborted = 0;
+    ctx->co_op = 0;
 }
 
 
@@ -652,7 +887,7 @@ ngx_http_lua_generic_phase_post_read(ngx_http_request_t *r)
     ngx_http_lua_ctx_t  *ctx;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua post read for rewrite/access phases");
+                   "lua post read for rewrite/access phases");
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
@@ -673,17 +908,19 @@ void
 ngx_http_lua_request_cleanup(void *data)
 {
     ngx_http_request_t          *r = data;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_lua_ctx_t          *ctx;
     lua_State                   *L;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_loc_conf_t     *llcf;
+    ngx_http_lua_main_conf_t    *lmcf;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua request cleanup");
+                   "lua request cleanup");
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
     /*  force coroutine handling the request quit */
     if (ctx == NULL) {
+        dd("ctx is NULL");
         return;
     }
 
@@ -696,140 +933,347 @@ ngx_http_lua_request_cleanup(void *data)
 
     L = lmcf->lua;
 
+    /* we cannot release the ngx.ctx table if we have log_by_lua* hooks
+     * because request cleanup runs before log phase handlers */
+
     if (ctx->ctx_ref != LUA_NOREF) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua release ngx.ctx");
 
-        lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_REQ_CTX_REF);
-        luaL_unref(L, -1, ctx->ctx_ref);
-        ctx->ctx_ref = LUA_NOREF;
-        lua_pop(L, 1);
+        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+
+        if (llcf->log_handler == NULL) {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua release ngx.ctx");
+
+            lua_pushlightuserdata(L, &ngx_http_lua_ctx_tables_key);
+            lua_rawget(L, LUA_REGISTRYINDEX);
+            luaL_unref(L, -1, ctx->ctx_ref);
+            ctx->ctx_ref = LUA_NOREF;
+            lua_pop(L, 1);
+        }
     }
 
-    if (ctx->cc_ref == LUA_NOREF) {
-        return;
-    }
-
-    lua_getfield(L, LUA_REGISTRYINDEX, NGX_LUA_CORT_REF);
-    lua_rawgeti(L, -1, ctx->cc_ref);
-
-    if (lua_isthread(L, -1)) {
-        /*  coroutine not finished yet, force quit */
-        ngx_http_lua_del_thread(r, L, ctx->cc_ref);
-        ctx->cc_ref = LUA_NOREF;
-
-    } else {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua internal error: not a thread object for the current "
-                "coroutine");
-
-        luaL_unref(L, -2, ctx->cc_ref);
-    }
-
-    lua_pop(L, 2);
+    ngx_http_lua_finalize_coroutines(r, ctx);
+    ngx_http_lua_del_all_threads(r, L, ctx);
 }
 
 
+/*
+ * description:
+ *  run a Lua coroutine specified by ctx->cur_co_ctx->co
+ * return value:
+ *  NGX_AGAIN:      I/O interruption: r->main->count intact
+ *  NGX_DONE:       I/O interruption: r->main->count already incremented by 1
+ *  NGX_ERROR:      error
+ *  >= 200          HTTP status code
+ */
 ngx_int_t
 ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx, int nret)
+    ngx_http_lua_ctx_t *ctx, int nret)
 {
-    int                      rv;
-    int                      cc_ref;
-    lua_State               *cc;
+    ngx_http_lua_co_ctx_t   *next_coctx, *parent_coctx;
+    int                      rv, nrets, success = 1;
+    lua_State               *next_co;
+    lua_State               *old_co;
     const char              *err, *msg, *trace;
     ngx_int_t                rc;
 #if (NGX_PCRE)
-    ngx_pool_t              *old_pool;
-    unsigned                 pcre_pool_resumed = 0;
+    ngx_pool_t              *old_pool = NULL;
 #endif
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua run thread");
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread, top:%d", lua_gettop(L));
 
     /* set Lua VM panic handler */
     lua_atpanic(L, ngx_http_lua_atpanic);
 
     dd("ctx = %p", ctx);
 
-    cc = ctx->cc;
-    cc_ref = ctx->cc_ref;
+    NGX_LUA_EXCEPTION_TRY {
+
+        if (ctx->cur_co_ctx->thread_spawn_yielded) {
+            ngx_http_lua_probe_info("thread spawn yielded");
+
+            ctx->cur_co_ctx->thread_spawn_yielded = 0;
+            nrets = 1;
+
+        } else {
+            nrets = nret;
+        }
+
+        for ( ;; ) {
+
+            dd("calling lua_resume: vm %p, nret %d", ctx->cur_co_ctx->co,
+               (int) nret);
 
 #if (NGX_PCRE)
-        /* XXX: work-around to nginx regex subsystem */
-    old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
+            /* XXX: work-around to nginx regex subsystem */
+            old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
 #endif
 
-    NGX_LUA_EXCEPTION_TRY {
-        dd("calling lua_resume: vm %p, nret %d", cc, (int) nret);
+            /*  run code */
+            dd("ctx: %p", ctx);
+            dd("cur co: %p", ctx->cur_co_ctx->co);
 
-        /*  run code */
-        rv = lua_resume(cc, nret);
+            rv = lua_resume(ctx->cur_co_ctx->co, nrets);
 
 #if (NGX_PCRE)
-        /* XXX: work-around to nginx regex subsystem */
-        ngx_http_lua_pcre_malloc_done(old_pool);
-        pcre_pool_resumed = 1;
+            /* XXX: work-around to nginx regex subsystem */
+            ngx_http_lua_pcre_malloc_done(old_pool);
 #endif
 
 #if 0
-        /* test the longjmp thing */
-        if (rand() % 2 == 0) {
-            NGX_LUA_EXCEPTION_THROW(1);
-        }
+            /* test the longjmp thing */
+            if (rand() % 2 == 0) {
+                NGX_LUA_EXCEPTION_THROW(1);
+            }
 #endif
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "lua resume returned %d", rv);
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua resume returned %d", rv);
 
-        switch (rv) {
+            switch (rv) {
             case LUA_YIELD:
                 /*  yielded, let event handler do the rest job */
                 /*  FIXME: add io cmd dispatcher here */
 
                 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                        "lua thread yielded");
+                               "lua thread yielded");
 
                 if (r->uri_changed) {
-                    return ngx_http_lua_handle_rewrite_jump(L, r, ctx, cc_ref);
+                    return ngx_http_lua_handle_rewrite_jump(L, r, ctx);
                 }
 
                 if (ctx->exited) {
-                    return ngx_http_lua_handle_exit(L, r, ctx, cc_ref);
+                    return ngx_http_lua_handle_exit(L, r, ctx);
                 }
 
                 if (ctx->exec_uri.len) {
-                    return ngx_http_lua_handle_exec(L, r, ctx, cc_ref);
+                    return ngx_http_lua_handle_exec(L, r, ctx);
                 }
 
-#if 0
-                ngx_http_lua_dump_postponed(r);
-#endif
+                /*
+                 * check if coroutine.resume or coroutine.yield called
+                 * lua_yield()
+                 */
+                switch(ctx->co_op) {
+                case NGX_HTTP_LUA_USER_CORO_NOP:
+                    dd("hit! it is the API yield");
 
-                lua_settop(cc, 0);
-                return NGX_AGAIN;
+                    lua_settop(ctx->cur_co_ctx->co, 0);
+                    ctx->cur_co_ctx = NULL;
+
+                    return NGX_AGAIN;
+
+                case NGX_HTTP_LUA_USER_THREAD_RESUME:
+
+                    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "lua user thread resume");
+
+                    ctx->co_op = NGX_HTTP_LUA_USER_CORO_NOP;
+                    nrets = lua_gettop(ctx->cur_co_ctx->co) - 1;
+                    dd("nrets = %d", nrets);
+
+                    break;
+
+                case NGX_HTTP_LUA_USER_CORO_RESUME:
+                    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "lua coroutine: resume");
+
+                    /*
+                     * the target coroutine lies at the base of the
+                     * parent's stack
+                     */
+                    ctx->co_op = NGX_HTTP_LUA_USER_CORO_NOP;
+
+                    old_co = ctx->cur_co_ctx->parent_co_ctx->co;
+
+                    nrets = lua_gettop(old_co);
+                    if (nrets) {
+                        lua_xmove(old_co, ctx->cur_co_ctx->co, nrets);
+                    }
+
+                    break;
+
+                default:
+                    /* ctx->co_op == NGX_HTTP_LUA_USER_CORO_YIELD */
+
+                    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "lua coroutine: yield");
+
+                    ctx->co_op = NGX_HTTP_LUA_USER_CORO_NOP;
+
+                    if (ngx_http_lua_is_thread(ctx)) {
+                        ngx_http_lua_probe_thread_yield(r, ctx->cur_co_ctx->co);
+
+                        lua_settop(ctx->cur_co_ctx->co, 0);
+
+                        ngx_http_lua_probe_info("set co running");
+                        ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+
+                        if (ctx->posted_threads) {
+                            ngx_http_lua_post_thread(r, ctx, ctx->cur_co_ctx);
+                            ctx->cur_co_ctx = NULL;
+                            return NGX_AGAIN;
+                        }
+
+                        /* no pending threads, so resume the thread
+                         * immediately */
+
+                        nrets = 0;
+                        continue;
+                    }
+
+                    /* being a user coroutine that has a parent */
+
+                    nrets = lua_gettop(ctx->cur_co_ctx->co);
+
+                    next_coctx = ctx->cur_co_ctx->parent_co_ctx;
+                    next_co = next_coctx->co;
+
+                    /*
+                     * prepare return values for coroutine.resume
+                     * (true plus any retvals)
+                     */
+                    lua_pushboolean(next_co, 1);
+
+                    if (nrets) {
+                        lua_xmove(ctx->cur_co_ctx->co, next_co, nrets);
+                    }
+
+                    nrets++;
+
+                    ctx->cur_co_ctx = next_coctx;
+
+                    break;
+                }
+
+                /* try resuming on the new coroutine again */
+                continue;
 
             case 0:
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                        "lua thread ended normally");
 
-#if 0
-                ngx_http_lua_dump_postponed(r);
-#endif
+                ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 1);
 
-                ngx_http_lua_del_thread(r, L, cc_ref);
-                ctx->cc_ref = LUA_NOREF;
+                ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
 
-                if (ctx->entered_content_phase) {
-                    rc = ngx_http_lua_send_chain_link(r, ctx,
-                            NULL /* indicate last_buf */);
-
-                    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-                        return rc;
-                    }
+                if (ctx->cur_co_ctx->zombie_child_threads) {
+                    ngx_http_lua_cleanup_zombie_child_uthreads(r, L, ctx,
+                                                               ctx->cur_co_ctx);
                 }
 
-                return NGX_OK;
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "lua light thread ended normally");
+
+                if (ngx_http_lua_is_entry_thread(ctx)) {
+
+                    lua_settop(L, 0);
+
+                    ngx_http_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
+
+                    dd("uthreads: %d", (int) ctx->uthreads);
+
+                    if (ctx->uthreads) {
+
+                        ctx->cur_co_ctx = NULL;
+                        return NGX_AGAIN;
+                    }
+
+                    /* all user threads terminated already */
+                    goto done;
+                }
+
+                if (ctx->cur_co_ctx->is_uthread) {
+                    /* being a user thread */
+
+                    lua_settop(L, 0);
+
+                    parent_coctx = ctx->cur_co_ctx->parent_co_ctx;
+
+                    if (ngx_http_lua_coroutine_alive(parent_coctx)) {
+                        if (ctx->cur_co_ctx->waited_by_parent) {
+                            ngx_http_lua_probe_info("parent already waiting");
+                            ctx->cur_co_ctx->waited_by_parent = 0;
+                            success = 1;
+                            goto user_co_done;
+                        }
+
+                        ngx_http_lua_probe_info("parent still alive");
+
+                        if (ngx_http_lua_post_zombie_thread(r, parent_coctx,
+                                                            ctx->cur_co_ctx)
+                            != NGX_OK)
+                        {
+                            return NGX_ERROR;
+                        }
+
+                        lua_pushboolean(ctx->cur_co_ctx->co, 1);
+                        lua_insert(ctx->cur_co_ctx->co, 1);
+
+                        ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_ZOMBIE;
+                        ctx->cur_co_ctx = NULL;
+                        return NGX_AGAIN;
+                    }
+
+                    ngx_http_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
+                    ctx->uthreads--;
+
+                    if (ctx->uthreads == 0) {
+                        if (ngx_http_lua_entry_thread_alive(ctx)) {
+                            ctx->cur_co_ctx = NULL;
+                            return NGX_AGAIN;
+                        }
+
+                        /* all threads terminated already */
+                        goto done;
+                    }
+
+                    /* some other user threads still running */
+                    ctx->cur_co_ctx = NULL;
+                    return NGX_AGAIN;
+                }
+
+                /* being a user coroutine that has a parent */
+
+                success = 1;
+
+user_co_done:
+                nrets = lua_gettop(ctx->cur_co_ctx->co);
+
+                next_coctx = ctx->cur_co_ctx->parent_co_ctx;
+
+                if (next_coctx == NULL) {
+                    /* being a light thread */
+                    goto no_parent;
+                }
+
+                next_co = next_coctx->co;
+
+                /*
+                 * ended successful, coroutine.resume returns true plus
+                 * any return values
+                 */
+                lua_pushboolean(next_co, success);
+
+                if (nrets) {
+                    lua_xmove(ctx->cur_co_ctx->co, next_co, nrets);
+                }
+
+                if (ctx->cur_co_ctx->is_uthread) {
+                    ngx_http_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
+                    ctx->uthreads--;
+                }
+
+                nrets++;
+                ctx->cur_co_ctx = next_coctx;
+
+                ngx_http_lua_probe_info("set parent running");
+
+                next_coctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "lua coroutine: lua user thread ended normally");
+
+                continue;
 
             case LUA_ERRRUN:
                 err = "runtime error";
@@ -850,44 +1294,163 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
             default:
                 err = "unknown error";
                 break;
+            }
+
+            if (lua_isstring(ctx->cur_co_ctx->co, -1)) {
+                dd("user custom error msg");
+                msg = lua_tostring(ctx->cur_co_ctx->co, -1);
+
+            } else {
+                msg = "unknown reason";
+            }
+
+            ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 0);
+
+            ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+
+            ngx_http_lua_thread_traceback(L, ctx->cur_co_ctx->co,
+                                          ctx->cur_co_ctx);
+            trace = lua_tostring(L, -1);
+
+            if (ctx->cur_co_ctx->is_uthread) {
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "lua user thread aborted: %s: %s\n%s",
+                              err, msg, trace);
+
+                lua_settop(L, 0);
+
+                parent_coctx = ctx->cur_co_ctx->parent_co_ctx;
+
+                if (ngx_http_lua_coroutine_alive(parent_coctx)) {
+                    if (ctx->cur_co_ctx->waited_by_parent) {
+                        ctx->cur_co_ctx->waited_by_parent = 0;
+                        success = 0;
+                        goto user_co_done;
+                    }
+
+                    if (ngx_http_lua_post_zombie_thread(r, parent_coctx,
+                                                        ctx->cur_co_ctx)
+                        != NGX_OK)
+                    {
+                        return NGX_ERROR;
+                    }
+
+                    lua_pushboolean(ctx->cur_co_ctx->co, 0);
+                    lua_insert(ctx->cur_co_ctx->co, 1);
+
+                    ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_ZOMBIE;
+                    ctx->cur_co_ctx = NULL;
+                    return NGX_AGAIN;
+                }
+
+                ngx_http_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
+                ctx->uthreads--;
+
+                if (ctx->uthreads == 0) {
+                    if (ngx_http_lua_entry_thread_alive(ctx)) {
+                        ctx->cur_co_ctx = NULL;
+                        return NGX_AGAIN;
+                    }
+
+                    /* all threads terminated already */
+                    goto done;
+                }
+
+                /* some other user threads still running */
+                ctx->cur_co_ctx = NULL;
+                return NGX_AGAIN;
+            }
+
+            if (ngx_http_lua_is_entry_thread(ctx)) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "lua entry thread aborted: %s: %s\n%s",
+                              err, msg, trace);
+
+                lua_settop(L, 0);
+
+                /* being the entry thread aborted */
+
+                if (r->filter_finalize) {
+                    ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+                }
+
+                ngx_http_lua_request_cleanup(r);
+
+                dd("headers sent? %d", ctx->headers_sent ? 1 : 0);
+
+                if (ctx->no_abort) {
+                    ctx->no_abort = 0;
+                    return NGX_ERROR;
+                }
+
+                return ctx->headers_sent ? NGX_ERROR :
+                            NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            /* being a user coroutine that has a parent */
+
+            next_coctx = ctx->cur_co_ctx->parent_co_ctx;
+            if (next_coctx == NULL) {
+                goto no_parent;
+            }
+
+            next_co = next_coctx->co;
+
+            ngx_http_lua_probe_info("set parent running");
+
+            next_coctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+
+            /*
+             * ended with error, coroutine.resume returns false plus
+             * err msg
+             */
+            lua_pushboolean(next_co, 0);
+            lua_xmove(ctx->cur_co_ctx->co, next_co, 1);
+            nrets = 2;
+
+            ctx->cur_co_ctx = next_coctx;
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "lua coroutine: %s: %s\n%s", err, msg, trace);
+
+            /* try resuming on the new coroutine again */
+            continue;
         }
 
-        if (lua_isstring(cc, -1)) {
-            dd("user custom error msg");
-            msg = lua_tostring(cc, -1);
-
-        } else {
-            msg = "unknown reason";
-        }
-
-        debug_traceback(L, cc);
-        trace = lua_tostring(L, -1);
-        lua_pop(L, -1);
-
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "lua handler aborted: %s: %s\n%s", err, msg, trace);
-
-        ngx_http_lua_del_thread(r, L, cc_ref);
-        ctx->cc_ref = LUA_NOREF;
-
-        ngx_http_lua_request_cleanup(r);
-
-        dd("headers sent? %d", ctx->headers_sent ? 1 : 0);
-
-        return ctx->headers_sent ? NGX_ERROR : NGX_HTTP_INTERNAL_SERVER_ERROR;
-
     } NGX_LUA_EXCEPTION_CATCH {
-
         dd("nginx execution restored");
-
-#if (NGX_PCRE)
-        if (!pcre_pool_resumed) {
-            ngx_http_lua_pcre_malloc_done(old_pool);
-        }
-#endif
     }
 
     return NGX_ERROR;
+
+no_parent:
+    lua_settop(L, 0);
+
+    ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+
+    if (r->filter_finalize) {
+        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+    }
+
+    ngx_http_lua_request_cleanup(r);
+
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "lua handler aborted: "
+                  "user coroutine has no parent");
+
+    return ctx->headers_sent ? NGX_ERROR : NGX_HTTP_INTERNAL_SERVER_ERROR;
+
+done:
+    if (ctx->entered_content_phase) {
+        rc = ngx_http_lua_send_chain_link(r, ctx,
+                                          NULL /* last_buf */);
+
+        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+            return rc;
+        }
+    }
+
+    return NGX_OK;
 }
 
 
@@ -895,26 +1458,25 @@ ngx_int_t
 ngx_http_lua_wev_handler(ngx_http_request_t *r)
 {
     ngx_int_t                    rc;
+    ngx_list_part_t             *part;
     ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_main_conf_t    *lmcf;
-    int                          nret = 0;
     ngx_connection_t            *c;
     ngx_event_t                 *wev;
     ngx_http_core_loc_conf_t    *clcf;
     ngx_chain_t                 *cl;
-
-    ngx_http_lua_socket_upstream_t      *u;
+    ngx_http_lua_co_ctx_t       *coctx;
+    ngx_uint_t                   i;
 
     c = r->connection;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-            "lua run write event handler");
+                   "lua run write event handler");
 
     wev = c->write;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
-        goto error;
+        return NGX_ERROR;
     }
 
     clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
@@ -939,95 +1501,28 @@ ngx_http_lua_wev_handler(ngx_http_request_t *r)
             ngx_add_timer(wev, clcf->send_timeout);
 
             if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-                ngx_http_finalize_request(r, NGX_ERROR);
+                if (ctx->entered_content_phase) {
+                    ngx_http_finalize_request(r, NGX_ERROR);
+                }
                 return NGX_ERROR;
             }
         }
     }
 
-    dd("wev handler %.*s %.*s a:%d, postponed:%p",
-            (int) r->uri.len, r->uri.data,
-            (int) ngx_cached_err_log_time.len,
-            ngx_cached_err_log_time.data,
-            r == c->data,
-            r->postponed);
-#if 0
-    ngx_http_lua_dump_postponed(r);
-#endif
-
-    dd("ctx = %p", ctx);
-    dd("request done: %d", (int) r->done);
-    dd("cleanup done: %p", ctx->cleanup);
-
-    if (ctx->cleanup == NULL) {
-        /* already done */
-        dd("cleanup is null: %.*s", (int) r->uri.len, r->uri.data);
-
-        if (ctx->entered_content_phase) {
-            ngx_http_finalize_request(r,
-                    ngx_http_lua_flush_postponed_outputs(r));
-        }
-
-        return NGX_OK;
+    if (!wev->ready) {
+        goto useless;
     }
 
-    if (ctx->waiting_more_body && !ctx->req_read_body_done) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                "lua write event handler waiting for more request body data");
-
-        return NGX_DONE;
-    }
-
-    dd("waiting: %d, done: %d", (int) ctx->waiting,
-            ctx->done);
-
-    if (ctx->waiting && !ctx->done) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                "lua waiting for pending subrequests");
-
-#if 0
-        ngx_http_lua_dump_postponed(r);
-#endif
-
-        if (r == c->data && r->postponed) {
-            if (r->postponed->request) {
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                        "lua activating the next postponed request %V?%V",
-                        &r->postponed->request->uri,
-                        &r->postponed->request->args);
-
-                c->data = r->postponed->request;
-
-#if defined(nginx_version) && nginx_version >= 8012
-                ngx_http_post_request(r->postponed->request, NULL);
-#else
-                ngx_http_post_request(r->postponed->request);
-#endif
-
-            } else {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                        "lua flushing postponed output");
-
-                ngx_http_lua_flush_postponed_outputs(r);
-            }
-        }
-
-        return NGX_DONE;
-    }
-
-    dd("req read body done: %d", (int) ctx->req_read_body_done);
-
     if (c->buffered) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                "lua wev handler flushing output: buffered 0x%uxd",
-                c->buffered);
+                       "lua wev handler flushing output: buffered 0x%uxd",
+                       c->buffered);
 
-        rc = ngx_http_output_filter(r, NULL);
+        rc = ngx_http_lua_output_filter(r, NULL);
 
         if (rc == NGX_ERROR || rc > NGX_OK) {
             if (ctx->entered_content_phase) {
                 ngx_http_finalize_request(r, rc);
-                return NGX_DONE;
             }
 
             return rc;
@@ -1059,134 +1554,103 @@ ngx_http_lua_wev_handler(ngx_http_request_t *r)
             if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
                 if (ctx->entered_content_phase) {
                     ngx_http_finalize_request(r, NGX_ERROR);
-                    return NGX_DONE;
                 }
 
                 return NGX_ERROR;
             }
 
-            if (ctx->waiting_flush) {
+            if (ctx->flushing_coros) {
                 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                        "lua flush still waiting: buffered 0x%uxd",
-                        c->buffered);
+                               "lua flush still waiting: buffered 0x%uxd",
+                               c->buffered);
 
                 return NGX_DONE;
             }
-        }
-    }
-
-    if (ctx->socket_busy && !ctx->socket_ready) {
-        return NGX_DONE;
-    }
-
-    if (!ctx->socket_busy && ctx->socket_ready) {
-
-        dd("resuming socket api");
-
-        dd("setting socket_ready to 0");
-
-        ctx->socket_ready = 0;
-
-        u = ctx->data;
-        nret = u->prepare_retvals(r, u, ctx->cc);
-        if (nret == NGX_AGAIN) {
-            return NGX_DONE;
-        }
-
-        goto run;
-
-    } else if (ctx->waiting_flush) {
-
-        ctx->waiting_flush = 0;
-        nret = 0;
-
-        goto run;
-
-    } else if (ctx->req_read_body_done) {
-
-        dd("turned off req read body done");
-
-        ctx->req_read_body_done = 0;
-
-        nret = 0;
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                "lua read req body done, resuming lua thread");
-
-        goto run;
-
-    } else if (ctx->done) {
-
-        ctx->done = 0;
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                "lua run subrequests done, resuming lua thread");
-
-        dd("nsubreqs: %d", (int) ctx->nsubreqs);
-
-        ngx_http_lua_handle_subreq_responses(r, ctx);
-
-        dd("free sr_statues/headers/bodies memory ASAP");
 
+        } else {
 #if 1
-        ngx_pfree(r->pool, ctx->sr_statuses);
-
-        ctx->sr_statuses = NULL;
-        ctx->sr_headers = NULL;
-        ctx->sr_bodies = NULL;
+            if (wev->timer_set) {
+                ngx_del_timer(wev);
+            }
 #endif
-
-        nret = ctx->nsubreqs;
-
-        dd("location capture nret: %d", (int) nret);
-
-        goto run;
+        }
     }
 
+    if (ctx->flushing_coros) {
+
+        coctx = &ctx->entry_co_ctx;
+
+        if (coctx->flushing) {
+            coctx->flushing = 0;
+
+            ctx->flushing_coros--;
+            ctx->cur_co_ctx = coctx;
+
+            rc = ngx_http_lua_flush_resume_helper(r, ctx);
+            if (rc == NGX_ERROR || rc >= NGX_OK) {
+                return rc;
+            }
+
+            /* rc == NGX_DONE */
+        }
+
+        if (ctx->flushing_coros) {
+
+            if (ctx->user_co_ctx == NULL) {
+                return NGX_ERROR;
+            }
+
+            part = &ctx->user_co_ctx->part;
+            coctx = part->elts;
+
+            for (i = 0; /* void */; i++) {
+
+                if (i >= part->nelts) {
+                    if (part->next == NULL) {
+                        break;
+                    }
+
+                    part = part->next;
+                    coctx = part->elts;
+                    i = 0;
+                }
+
+                if (coctx[i].flushing) {
+                    coctx[i].flushing = 0;
+                    ctx->cur_co_ctx = &coctx[i];
+
+                    rc = ngx_http_lua_flush_resume_helper(r, ctx);
+                    if (rc == NGX_ERROR || rc >= NGX_OK) {
+                        return rc;
+                    }
+
+                    /* rc == NGX_DONE */
+
+                    if (--ctx->flushing_coros == 0) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (ctx->flushing_coros) {
+            return NGX_ERROR;
+        }
+
+        return NGX_DONE;
+    }
+
+    /* ctx->flushing_coros == 0 */
+
+useless:
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-            "useless lua write event handler");
+                   "useless lua write event handler");
 
     if (ctx->entered_content_phase) {
-        ngx_http_finalize_request(r, NGX_DONE);
+        return NGX_OK;
     }
 
-    return NGX_OK;
-
-run:
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    dd("about to run thread for %.*s...", (int) r->uri.len, r->uri.data);
-
-    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, nret);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-            "lua run thread returned %d", rc);
-
-    if (rc == NGX_AGAIN) {
-        return NGX_DONE;
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_finalize_request(r, rc);
-        return NGX_DONE;
-    }
-
-    dd("entered content phase: %d", (int) ctx->entered_content_phase);
-
-    if (ctx->entered_content_phase) {
-        ngx_http_finalize_request(r, rc);
-        return NGX_DONE;
-    }
-
-    return rc;
-
-error:
-    if (ctx && ctx->entered_content_phase) {
-        ngx_http_finalize_request(r,
-                ctx->headers_sent ? NGX_ERROR: NGX_HTTP_INTERNAL_SERVER_ERROR);
-    }
-
-    return NGX_ERROR;
+    return NGX_DONE;
 }
 
 
@@ -1204,69 +1668,6 @@ ngx_http_lua_digest_hex(u_char *dest, const u_char *buf, int buf_len)
 }
 
 
-void
-ngx_http_lua_dump_postponed(ngx_http_request_t *r)
-{
-    ngx_http_postponed_request_t    *pr;
-    ngx_uint_t                       i;
-    ngx_str_t                        out;
-    size_t                           len;
-    ngx_chain_t                     *cl;
-    u_char                          *p;
-    ngx_str_t                        nil_str;
-
-    ngx_str_set(&nil_str, "(nil)");
-
-    for (i = 0, pr = r->postponed; pr; pr = pr->next, i++) {
-        out.data = NULL;
-        out.len = 0;
-
-        len = 0;
-        for (cl = pr->out; cl; cl = cl->next) {
-            len += ngx_buf_size(cl->buf);
-        }
-
-        if (len) {
-            p = ngx_palloc(r->pool, len);
-            if (p == NULL) {
-                return;
-            }
-
-            out.data = p;
-
-            for (cl = pr->out; cl; cl = cl->next) {
-                p = ngx_copy(p, cl->buf->pos, ngx_buf_size(cl->buf));
-            }
-
-            out.len = len;
-        }
-
-        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                "postponed request for %V: "
-                "c:%d, "
-                "a:%d, i:%d, r:%V, out:%V",
-                &r->uri,
-                r->main->count,
-                r == r->connection->data, i,
-                pr->request ? &pr->request->uri : &nil_str, &out);
-    }
-}
-
-
-ngx_int_t
-ngx_http_lua_flush_postponed_outputs(ngx_http_request_t *r)
-{
-    if (r == r->connection->data && r->postponed) {
-        /* notify the downstream postpone filter to flush the postponed
-         * outputs of the current request */
-        return ngx_http_lua_next_body_filter(r, NULL);
-    }
-
-    /* do nothing */
-    return NGX_OK;
-}
-
-
 void
 ngx_http_lua_set_multi_value_table(lua_State *L, int index)
 {
@@ -1460,7 +1861,7 @@ ngx_http_lua_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
 /* XXX we also decode '+' to ' ' */
 void
 ngx_http_lua_unescape_uri(u_char **dst, u_char **src, size_t size,
-        ngx_uint_t type)
+    ngx_uint_t type)
 {
     u_char  *d, *s, ch, c, decoded;
     enum {
@@ -1593,39 +1994,20 @@ done:
 }
 
 
-void
-ngx_http_lua_inject_req_api_no_io(ngx_log_t *log, lua_State *L)
-{
-    /* ngx.req table */
-
-    lua_createtable(L, 0 /* narr */, 9 /* nrec */);    /* .req */
-
-    ngx_http_lua_inject_req_header_api(L);
-
-    ngx_http_lua_inject_req_uri_api(log, L);
-
-    ngx_http_lua_inject_req_args_api(L);
-
-    lua_setfield(L, -2, "req");
-}
-
-
 void
 ngx_http_lua_inject_req_api(ngx_log_t *log, lua_State *L)
 {
     /* ngx.req table */
 
-    lua_createtable(L, 0 /* narr */, 16 /* nrec */);    /* .req */
-
-    ngx_http_lua_inject_req_header_api(L);
+    lua_createtable(L, 0 /* narr */, 21 /* nrec */);    /* .req */
 
+    ngx_http_lua_inject_req_header_api(log, L);
     ngx_http_lua_inject_req_uri_api(log, L);
-
     ngx_http_lua_inject_req_args_api(L);
-
     ngx_http_lua_inject_req_body_api(L);
-
     ngx_http_lua_inject_req_socket_api(L);
+    ngx_http_lua_inject_req_method_api(L);
+    ngx_http_lua_inject_req_time_api(L);
 
     lua_setfield(L, -2, "req");
 }
@@ -1633,29 +2015,42 @@ ngx_http_lua_inject_req_api(ngx_log_t *log, lua_State *L)
 
 static ngx_int_t
 ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx, int cc_ref)
+    ngx_http_lua_ctx_t *ctx)
 {
     ngx_int_t               rc;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua thread initiated internal redirect to %V",
-            &ctx->exec_uri);
+                   "lua thread initiated internal redirect to %V",
+                   &ctx->exec_uri);
 
-    ngx_http_lua_del_thread(r, L, cc_ref);
-    ctx->cc_ref = LUA_NOREF;
+    ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 1);
+
+    ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+
+    if (r->filter_finalize) {
+        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+    }
 
     ngx_http_lua_request_cleanup(r);
 
     if (ctx->exec_uri.data[0] == '@') {
         if (ctx->exec_args.len > 0) {
             ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                    "query strings %V ignored when exec'ing "
-                    "named location %V",
-                    &ctx->exec_args, &ctx->exec_uri);
+                          "query strings %V ignored when exec'ing "
+                          "named location %V",
+                          &ctx->exec_args, &ctx->exec_uri);
         }
 
         r->write_event_handler = ngx_http_request_empty_handler;
 
+#if 1
+        if (r->read_event_handler == ngx_http_lua_rd_check_broken_connection) {
+            /* resume the read event handler */
+
+            r->read_event_handler = ngx_http_block_reading;
+        }
+#endif
+
 #if 1
         /* clear the modules contexts */
         ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
@@ -1683,11 +2078,15 @@ ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
     dd("internal redirect to %.*s", (int) ctx->exec_uri.len,
             ctx->exec_uri.data);
 
-    /* resume the write event handler */
     r->write_event_handler = ngx_http_request_empty_handler;
 
-    rc = ngx_http_internal_redirect(r, &ctx->exec_uri,
-            &ctx->exec_args);
+    if (r->read_event_handler == ngx_http_lua_rd_check_broken_connection) {
+        /* resume the read event handler */
+
+        r->read_event_handler = ngx_http_block_reading;
+    }
+
+    rc = ngx_http_internal_redirect(r, &ctx->exec_uri, &ctx->exec_args);
 
     dd("internal redirect returned %d when in content phase? "
             "%d", (int) rc, ctx->entered_content_phase);
@@ -1696,8 +2095,6 @@ ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
         return rc;
     }
 
-    dd("XXYY HERE %d\n", (int) r->main->count);
-
 #if 0
     if (!ctx->entered_content_phase) {
         /* XXX ensure the main request ref count
@@ -1714,30 +2111,38 @@ ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
 
 static ngx_int_t
 ngx_http_lua_handle_exit(lua_State *L, ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx, int cc_ref)
+    ngx_http_lua_ctx_t *ctx)
 {
     ngx_int_t           rc;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua thread aborting request with status %d",
-            ctx->exit_code);
+                   "lua thread aborting request with status %d",
+                   ctx->exit_code);
 
-    ngx_http_lua_del_thread(r, L, cc_ref);
-    ctx->cc_ref = LUA_NOREF;
+#if 1
+    if (!ctx->headers_sent && ctx->exit_code >= NGX_HTTP_OK) {
+        r->headers_out.status = ctx->exit_code;
+    }
+#endif
+
+    ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 1);
+
+    ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+
+    if (r->filter_finalize) {
+        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+    }
 
     ngx_http_lua_request_cleanup(r);
 
-    if ((ctx->exit_code == NGX_OK &&
-                ctx->entered_content_phase) ||
-                (ctx->exit_code >= NGX_HTTP_OK &&
-                ctx->exit_code < NGX_HTTP_SPECIAL_RESPONSE))
+    if ((ctx->exit_code == NGX_OK
+         && ctx->entered_content_phase)
+        || (ctx->exit_code >= NGX_HTTP_OK
+            && ctx->exit_code < NGX_HTTP_SPECIAL_RESPONSE))
     {
-        rc = ngx_http_lua_send_chain_link(r, ctx,
-                NULL /* indicate last_buf */);
+        rc = ngx_http_lua_send_chain_link(r, ctx, NULL /* indicate last_buf */);
 
-        if (rc == NGX_ERROR ||
-                rc >= NGX_HTTP_SPECIAL_RESPONSE)
-        {
+        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
             return rc;
         }
     }
@@ -1748,13 +2153,14 @@ ngx_http_lua_handle_exit(lua_State *L, ngx_http_request_t *r,
 
 void
 ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
-        int table, ngx_str_t *args)
+    int table, ngx_str_t *args)
 {
     u_char              *key;
     size_t               key_len;
     u_char              *value;
     size_t               value_len;
     size_t               len = 0;
+    size_t               key_escape = 0;
     uintptr_t            total_escape = 0;
     int                  n;
     int                  i;
@@ -1769,13 +2175,15 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
     while (lua_next(L, table) != 0) {
         if (lua_type(L, -2) != LUA_TSTRING) {
             luaL_error(L, "attempt to use a non-string key in the "
-                    "\"args\" option table");
+                       "\"args\" option table");
             return;
         }
 
         key = (u_char *) lua_tolstring(L, -2, &key_len);
-        total_escape += 2 * ngx_http_lua_escape_uri(NULL, key, key_len,
-                NGX_ESCAPE_URI);
+
+        key_escape = 2 * ngx_http_lua_escape_uri(NULL, key, key_len,
+                                                 NGX_ESCAPE_URI);
+        total_escape += key_escape;
 
         switch (lua_type(L, -1)) {
         case LUA_TNUMBER:
@@ -1800,21 +2208,27 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
 
         case LUA_TTABLE:
 
+            i = 0;
             lua_pushnil(L);
             while (lua_next(L, -2) != 0) {
-
                 value = (u_char *) lua_tolstring(L, -1, &value_len);
 
                 if (value == NULL) {
                     luaL_error(L, "attempt to use %s as query arg value",
-                            luaL_typename(L, -1));
+                               luaL_typename(L, -1));
                     return;
                 }
 
                 total_escape += 2 * ngx_http_lua_escape_uri(NULL, value,
-                        value_len, NGX_ESCAPE_URI);
+                                                            value_len,
+                                                            NGX_ESCAPE_URI);
+
                 len += key_len + value_len + (sizeof("=") - 1);
 
+                if (i++ > 0) {
+                    total_escape += key_escape;
+                }
+
                 n++;
 
                 lua_pop(L, 1);
@@ -1824,7 +2238,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
 
         default:
             luaL_error(L, "attempt to use %s as query arg value",
-                    luaL_typename(L, -1));
+                       luaL_typename(L, -1));
             return;
         }
 
@@ -1917,7 +2331,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
 
                 if (total_escape) {
                     p = (u_char *) ngx_http_lua_escape_uri(p, key, key_len,
-                            NGX_ESCAPE_URI);
+                                                           NGX_ESCAPE_URI);
 
                 } else {
                     dd("shortcut: no escape required");
@@ -1931,7 +2345,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
 
                 if (total_escape) {
                     p = (u_char *) ngx_http_lua_escape_uri(p, value, value_len,
-                            NGX_ESCAPE_URI);
+                                                           NGX_ESCAPE_URI);
 
                 } else {
                     p = ngx_copy(p, value, value_len);
@@ -1967,14 +2381,19 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
 
 static ngx_int_t
 ngx_http_lua_handle_rewrite_jump(lua_State *L, ngx_http_request_t *r,
-        ngx_http_lua_ctx_t *ctx, int cc_ref)
+    ngx_http_lua_ctx_t *ctx)
 {
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua thread aborting request with URI rewrite jump: \"%V?%V\"",
-            &r->uri, &r->args);
+                   "lua thread aborting request with URI rewrite jump: "
+                   "\"%V?%V\"", &r->uri, &r->args);
 
-    ngx_http_lua_del_thread(r, L, cc_ref);
-    ctx->cc_ref = LUA_NOREF;
+    ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 1);
+
+    ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+
+    if (r->filter_finalize) {
+        ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+    }
 
     ngx_http_lua_request_cleanup(r);
 
@@ -1985,7 +2404,7 @@ ngx_http_lua_handle_rewrite_jump(lua_State *L, ngx_http_request_t *r,
 /* XXX ngx_open_and_stat_file is static in the core. sigh. */
 ngx_int_t
 ngx_http_lua_open_and_stat_file(u_char *name, ngx_open_file_info_t *of,
-        ngx_log_t *log)
+    ngx_log_t *log)
 {
     ngx_fd_t         fd;
     ngx_file_info_t  fi;
@@ -2093,83 +2512,6 @@ failed:
 }
 
 
-void
-ngx_http_lua_inject_internal_utils(ngx_log_t *log, lua_State *L)
-{
-    ngx_int_t         rc;
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_check_aborted);
-    lua_setfield(L, -2, "_check_aborted"); /* deprecated */
-
-    /* override the default pcall */
-
-    lua_getglobal(L, "pcall");
-    lua_setfield(L, -2, "_pcall");
-
-    {
-        const char    buf[] = "local ret = {ngx._pcall(...)} "
-                              "ngx._check_aborted() return unpack(ret)";
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "ngx_lua pcall");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx_lua pcall(): %i",
-                      rc);
-
-    } else {
-        lua_setglobal(L, "pcall");
-    }
-
-    /* override the default xpcall */
-
-    lua_getglobal(L, "xpcall");
-    lua_setfield(L, -2, "_xpcall");
-
-    {
-        const char    buf[] = "local ret = {ngx._xpcall(...)} "
-                              "ngx._check_aborted() return unpack(ret)";
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "ngx_lua xpcall");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx_lua xpcall(): %i",
-                      rc);
-
-    } else {
-        lua_setglobal(L, "xpcall");
-    }
-}
-
-
-static int
-ngx_http_lua_ngx_check_aborted(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (r == NULL) {
-        return 0;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return 0;
-    }
-
-    NGX_HTTP_LUA_CHECK_ABORTED(L, ctx);
-
-    return 0;
-}
-
-
 ngx_chain_t *
 ngx_http_lua_chains_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
     ngx_chain_t **free, size_t len, ngx_buf_tag_t tag)
@@ -2185,8 +2527,8 @@ ngx_http_lua_chains_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
         b = cl->buf;
         if ((size_t) (b->end - b->start) >= len) {
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, log, 0,
-                    "lua reuse free buf memory %O >= %uz, cl:%p, p:%p",
-                    (off_t) (b->end - b->start), len, cl, b->start);
+                           "lua reuse free buf memory %O >= %uz, cl:%p, p:%p",
+                           (off_t) (b->end - b->start), len, cl, b->start);
 
             b->pos = b->start;
             b->last = b->start;
@@ -2203,14 +2545,21 @@ ngx_http_lua_chains_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
             ngx_pfree(p, b->start);
         }
 
-        b->start = ngx_palloc(p, len);
-        if (b->start == NULL) {
-            return NULL;
+        if (len) {
+            b->start = ngx_palloc(p, len);
+            if (b->start == NULL) {
+                return NULL;
+            }
+
+            b->end = b->start + len;
+
+        } else {
+            b->last = NULL;
+            b->end = NULL;
         }
 
         dd("buf start: %p", cl->buf->start);
 
-        b->end = b->start + len;
         b->pos = b->start;
         b->last = b->start;
         b->tag = tag;
@@ -2242,60 +2591,679 @@ ngx_http_lua_chains_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
 
 
 static int
-debug_traceback(lua_State *L, lua_State *L1) {
-    int         arg = 0;
-    int         level = 0;
+ngx_http_lua_thread_traceback(lua_State *L, lua_State *co,
+    ngx_http_lua_co_ctx_t *coctx)
+{
+    int         base;
+    int         level = 0, count = 0;
     int         firstpart = 1;  /* still before eventual `...' */
     lua_Debug   ar;
 
+    base = lua_gettop(L);
+
     lua_pushliteral(L, "stack traceback:");
 
-    while (lua_getstack(L1, level++, &ar)) {
+    while (co) {
 
-        if (level > LEVELS1 && firstpart) {
-            /* no more than `LEVELS2' more levels? */
-            if (!lua_getstack(L1, level + LEVELS2, &ar)) {
-                level--;  /* keep going */
+        lua_pushfstring(L, "\ncoroutine %d:", count++);
 
-            } else {
-                lua_pushliteral(L, "\n\t...");  /* too many levels */
-                /* This only works with LuaJIT 2.x. Avoids O(n^2) behaviour. */
-                lua_getstack(L1, -10, &ar);
-                level = ar.i_ci - LEVELS2;
+        while (lua_getstack(co, level++, &ar)) {
+
+            if (level > LEVELS1 && firstpart) {
+                /* no more than `LEVELS2' more levels? */
+                if (!lua_getstack(co, level + LEVELS2, &ar)) {
+                    level--;  /* keep going */
+
+                } else {
+                    lua_pushliteral(L, "\n\t...");  /* too many levels */
+                    /*
+                     * This only works with LuaJIT 2.x.
+                     * Avoids O(n^2) behaviour.
+                     */
+                    lua_getstack(co, -10, &ar);
+                    level = ar.i_ci - LEVELS2;
+                }
+
+                firstpart = 0;
+                continue;
             }
 
-            firstpart = 0;
-            continue;
-        }
+            lua_pushliteral(L, "\n\t");
+            lua_getinfo(co, "Snl", &ar);
+            lua_pushfstring(L, "%s:", ar.short_src);
 
-        lua_pushliteral(L, "\n\t");
-        lua_getinfo(L1, "Snl", &ar);
-        lua_pushfstring(L, "%s:", ar.short_src);
+            if (ar.currentline > 0) {
+                lua_pushfstring(L, "%d:", ar.currentline);
+            }
 
-        if (ar.currentline > 0) {
-            lua_pushfstring(L, "%d:", ar.currentline);
-        }
-
-        if (*ar.namewhat != '\0') {  /* is there a name? */
-            lua_pushfstring(L, " in function " LUA_QS, ar.name);
-
-        } else {
-            if (*ar.what == 'm') {  /* main? */
-                lua_pushfstring(L, " in main chunk");
-
-            } else if (*ar.what == 'C' || *ar.what == 't') {
-                lua_pushliteral(L, " ?");  /* C function or tail call */
+            if (*ar.namewhat != '\0') {  /* is there a name? */
+                lua_pushfstring(L, " in function " LUA_QS, ar.name);
 
             } else {
-                lua_pushfstring(L, " in function <%s:%d>",
-                                ar.short_src, ar.linedefined);
+                if (*ar.what == 'm') {  /* main? */
+                    lua_pushfstring(L, " in main chunk");
+
+                } else if (*ar.what == 'C' || *ar.what == 't') {
+                    lua_pushliteral(L, " ?");  /* C function or tail call */
+
+                } else {
+                    lua_pushfstring(L, " in function <%s:%d>",
+                                    ar.short_src, ar.linedefined);
+                }
             }
         }
 
-        lua_concat(L, lua_gettop(L) - arg);
+        lua_concat(L, lua_gettop(L) - base);
+
+        level = 0;
+        firstpart = 1;
+
+        /* check if the coroutine has a parent coroutine*/
+        coctx = coctx->parent_co_ctx;
+        if (!coctx || coctx->co_status == NGX_HTTP_LUA_CO_DEAD) {
+            break;
+        }
+
+        co = coctx->co;
     }
 
-    lua_concat(L, lua_gettop(L) - arg);
     return 1;
 }
 
+
+int
+ngx_http_lua_traceback(lua_State *L)
+{
+    if (!lua_isstring(L, 1)) { /* 'message' not a string? */
+        return 1;  /* keep it intact */
+    }
+
+    lua_getfield(L, LUA_GLOBALSINDEX, "debug");
+    if (!lua_istable(L, -1)) {
+        lua_pop(L, 1);
+        return 1;
+    }
+
+    lua_getfield(L, -1, "traceback");
+    if (!lua_isfunction(L, -1)) {
+        lua_pop(L, 2);
+        return 1;
+    }
+
+    lua_pushvalue(L, 1);  /* pass error message */
+    lua_pushinteger(L, 2);  /* skip this function and traceback */
+    lua_call(L, 2, 1);  /* call debug.traceback */
+    return 1;
+}
+
+
+static void
+ngx_http_lua_inject_arg_api(lua_State *L)
+{
+    lua_pushliteral(L, "arg");
+    lua_newtable(L);    /*  .arg table aka {} */
+
+    lua_createtable(L, 0 /* narr */, 2 /* nrec */);    /*  the metatable */
+
+    lua_pushcfunction(L, ngx_http_lua_param_get);
+    lua_setfield(L, -2, "__index");
+
+    lua_pushcfunction(L, ngx_http_lua_param_set);
+    lua_setfield(L, -2, "__newindex");
+
+    lua_setmetatable(L, -2);    /*  tie the metatable to param table */
+
+    dd("top: %d, type -1: %s", lua_gettop(L), luaL_typename(L, -1));
+
+    lua_rawset(L, -3);    /*  set ngx.arg table */
+}
+
+
+static int
+ngx_http_lua_param_get(lua_State *L)
+{
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_request_t          *r;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return 0;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "ctx not found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_SET
+                               | NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
+
+    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SET)) {
+        return ngx_http_lua_setby_param_get(L);
+    }
+
+    /* ctx->context & (NGX_HTTP_LUA_CONTEXT_BODY_FILTER) */
+
+    return ngx_http_lua_body_filter_param_get(L);
+}
+
+
+static int
+ngx_http_lua_param_set(lua_State *L)
+{
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_request_t          *r;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
+    r = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (r == NULL) {
+        return 0;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "ctx not found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
+
+    return ngx_http_lua_body_filter_param_set(L, r, ctx);
+}
+
+
+ngx_http_lua_co_ctx_t *
+ngx_http_lua_get_co_ctx(lua_State *L, ngx_http_lua_ctx_t *ctx)
+{
+    ngx_uint_t                   i;
+    ngx_list_part_t             *part;
+    ngx_http_lua_co_ctx_t       *coctx;
+
+    if (L == ctx->entry_co_ctx.co) {
+        return &ctx->entry_co_ctx;
+    }
+
+    if (ctx->user_co_ctx == NULL) {
+        return NULL;
+    }
+
+    part = &ctx->user_co_ctx->part;
+    coctx = part->elts;
+
+    /* FIXME: we should use rbtree here to prevent O(n) lookup overhead */
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            coctx = part->elts;
+            i = 0;
+        }
+
+        if (coctx[i].co == L) {
+            return &coctx[i];
+        }
+    }
+
+    return NULL;
+}
+
+
+ngx_http_lua_co_ctx_t *
+ngx_http_lua_create_co_ctx(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
+{
+    ngx_http_lua_co_ctx_t       *coctx;
+
+    if (ctx->user_co_ctx == NULL) {
+        ctx->user_co_ctx = ngx_list_create(r->pool, 4,
+                                           sizeof(ngx_http_lua_co_ctx_t));
+        if (ctx->user_co_ctx == NULL) {
+            return NULL;
+        }
+    }
+
+    coctx = ngx_list_push(ctx->user_co_ctx);
+    if (coctx == NULL) {
+        return NULL;
+    }
+
+    ngx_memzero(coctx, sizeof(ngx_http_lua_co_ctx_t));
+
+    coctx->co_ref = LUA_NOREF;
+
+    return coctx;
+}
+
+
+/* this is for callers other than the content handler */
+ngx_int_t
+ngx_http_lua_run_posted_threads(ngx_connection_t *c, lua_State *L,
+    ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
+{
+    ngx_int_t                        rc;
+    ngx_http_lua_posted_thread_t    *pt;
+
+    for ( ;; ) {
+        if (c->destroyed) {
+            return NGX_DONE;
+        }
+
+        pt = ctx->posted_threads;
+        if (pt == NULL) {
+            return NGX_DONE;
+        }
+
+        ctx->posted_threads = pt->next;
+
+        ngx_http_lua_probe_run_posted_thread(r, pt->co_ctx->co,
+                                             (int) pt->co_ctx->co_status);
+
+        if (pt->co_ctx->co_status != NGX_HTTP_LUA_CO_RUNNING) {
+            continue;
+        }
+
+        ctx->cur_co_ctx = pt->co_ctx;
+
+        rc = ngx_http_lua_run_thread(L, r, ctx, 0);
+
+        if (rc == NGX_AGAIN) {
+            continue;
+        }
+
+        if (rc == NGX_DONE) {
+            ngx_http_finalize_request(r, NGX_DONE);
+            continue;
+        }
+
+        /* rc == NGX_ERROR || rc >= NGX_OK */
+
+        if (ctx->entered_content_phase) {
+            ngx_http_finalize_request(r, rc);
+        }
+
+        return rc;
+    }
+
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_http_lua_post_thread(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
+    ngx_http_lua_co_ctx_t *coctx)
+{
+    ngx_http_lua_posted_thread_t  **p;
+    ngx_http_lua_posted_thread_t   *pt;
+
+    pt = ngx_palloc(r->pool, sizeof(ngx_http_lua_posted_thread_t));
+    if (pt == NULL) {
+        return NGX_ERROR;
+    }
+
+    pt->co_ctx = coctx;
+    pt->next = NULL;
+
+    for (p = &ctx->posted_threads; *p; p = &(*p)->next) { /* void */ }
+
+    *p = pt;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_finalize_coroutines(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
+{
+    ngx_http_lua_co_ctx_t           *cc, *coctx;
+    ngx_list_part_t                 *part;
+    ngx_uint_t                       i;
+
+    if (ctx->uthreads == 0) {
+        if (ngx_http_lua_is_entry_thread(ctx)) {
+            return;
+        }
+
+        /* the current thread is not the entry thread */
+
+        if (ctx->entry_co_ctx.co_status == NGX_HTTP_LUA_CO_DEAD) {
+            return;
+        }
+    }
+
+    if (ctx->user_co_ctx) {
+        part = &ctx->user_co_ctx->part;
+        cc = part->elts;
+
+        for (i = 0; /* void */; i++) {
+
+            if (i >= part->nelts) {
+                if (part->next == NULL) {
+                    break;
+                }
+
+                part = part->next;
+                cc = part->elts;
+                i = 0;
+            }
+
+            coctx = &cc[i];
+            if (coctx->cleanup) {
+                coctx->cleanup(coctx);
+                coctx->cleanup = NULL;
+                coctx->co_status = NGX_HTTP_LUA_CO_DEAD;
+                /* TODO we could also free the user thread here */
+            }
+        }
+    }
+
+    coctx = &ctx->entry_co_ctx;
+    if (coctx->cleanup) {
+        coctx->cleanup(coctx);
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_post_zombie_thread(ngx_http_request_t *r,
+    ngx_http_lua_co_ctx_t *parent, ngx_http_lua_co_ctx_t *thread)
+{
+    ngx_http_lua_posted_thread_t  **p;
+    ngx_http_lua_posted_thread_t   *pt;
+
+    pt = ngx_palloc(r->pool, sizeof(ngx_http_lua_posted_thread_t));
+    if (pt == NULL) {
+        return NGX_ERROR;
+    }
+
+    pt->co_ctx = thread;
+    pt->next = NULL;
+
+    for (p = &parent->zombie_child_threads; *p; p = &(*p)->next) { /* void */ }
+
+    *p = pt;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_cleanup_zombie_child_uthreads(ngx_http_request_t *r,
+    lua_State *L, ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t *coctx)
+{
+    ngx_http_lua_posted_thread_t   *pt;
+
+    for (pt = coctx->zombie_child_threads; pt; pt = pt->next) {
+        if (pt->co_ctx->co_ref != LUA_NOREF) {
+            ngx_http_lua_del_thread(r, L, ctx, pt->co_ctx);
+            ctx->uthreads--;
+        }
+    }
+
+    coctx->zombie_child_threads = NULL;
+}
+
+
+ngx_int_t
+ngx_http_lua_check_broken_connection(ngx_http_request_t *r, ngx_event_t *ev)
+{
+    int                  n;
+    char                 buf[1];
+    ngx_err_t            err;
+    ngx_int_t            event;
+    ngx_connection_t     *c;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                   "http lua check client, write event:%d, \"%V\"",
+                   ev->write, &r->uri);
+
+    c = r->connection;
+
+    if (c->error) {
+        if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) {
+
+            event = ev->write ? NGX_WRITE_EVENT : NGX_READ_EVENT;
+
+            if (ngx_del_event(ev, event, 0) != NGX_OK) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+        }
+
+        return NGX_HTTP_CLIENT_CLOSED_REQUEST;
+    }
+
+#if (NGX_HAVE_KQUEUE)
+
+    if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+
+        if (!ev->pending_eof) {
+            return NGX_OK;
+        }
+
+        ev->eof = 1;
+
+        if (ev->kq_errno) {
+            ev->error = 1;
+        }
+
+        ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,
+                      "kevent() reported that client prematurely closed "
+                      "connection");
+
+        return NGX_HTTP_CLIENT_CLOSED_REQUEST;
+    }
+
+#endif
+
+    n = recv(c->fd, buf, 1, MSG_PEEK);
+
+    err = ngx_socket_errno;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err,
+                   "http lua recv(): %d", n);
+
+    if (ev->write && (n >= 0 || err == NGX_EAGAIN)) {
+        return NGX_OK;
+    }
+
+    if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) {
+        dd("event is active");
+
+        event = ev->write ? NGX_WRITE_EVENT : NGX_READ_EVENT;
+
+#if 1
+        if (ngx_del_event(ev, event, 0) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+#endif
+    }
+
+    dd("HERE %d", (int) n);
+
+    if (n > 0) {
+        return NGX_OK;
+    }
+
+    if (n == -1) {
+        if (err == NGX_EAGAIN) {
+            dd("HERE");
+            return NGX_OK;
+        }
+
+        ev->error = 1;
+
+    } else { /* n == 0 */
+        err = 0;
+    }
+
+    ev->eof = 1;
+
+    ngx_log_error(NGX_LOG_INFO, ev->log, err,
+                  "client prematurely closed connection");
+
+    return NGX_HTTP_CLIENT_CLOSED_REQUEST;
+}
+
+
+void
+ngx_http_lua_rd_check_broken_connection(ngx_http_request_t *r)
+{
+    ngx_int_t                   rc;
+    ngx_event_t                *rev;
+    ngx_http_lua_ctx_t         *ctx;
+
+    if (r->done) {
+        return;
+    }
+
+    rc = ngx_http_lua_check_broken_connection(r, r->connection->read);
+
+    if (rc == NGX_OK) {
+        return;
+    }
+
+    /* rc == NGX_ERROR || rc > NGX_OK */
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    if (ctx->on_abort_co_ctx == NULL) {
+        r->connection->error = 1;
+        ngx_http_lua_request_cleanup(r);
+        ngx_http_finalize_request(r, rc);
+        return;
+    }
+
+    if (ctx->on_abort_co_ctx->co_status != NGX_HTTP_LUA_CO_SUSPENDED) {
+
+        /* on_abort already run for the current request handler */
+
+        rev = r->connection->read;
+
+        if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && rev->active) {
+            if (ngx_del_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
+                ngx_http_lua_request_cleanup(r);
+                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return;
+            }
+        }
+
+        return;
+    }
+
+    ctx->uthreads++;
+    ctx->resume_handler = ngx_http_lua_on_abort_resume;
+    ctx->on_abort_co_ctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+    ctx->cur_co_ctx = ctx->on_abort_co_ctx;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua waking up the on_abort callback thread");
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+    }
+
+    r->write_event_handler(r);
+}
+
+
+static ngx_int_t
+ngx_http_lua_on_abort_resume(ngx_http_request_t *r)
+{
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua resuming the on_abort callback thread");
+
+#if 0
+    ngx_http_lua_probe_info("tcp resume");
+#endif
+
+    c = r->connection;
+
+    rc = ngx_http_lua_run_thread(lmcf->lua, r, ctx, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, lmcf->lua, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c,lmcf->lua, r, ctx);
+    }
+
+    if (ctx->entered_content_phase) {
+        ngx_http_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_http_lua_test_expect(ngx_http_request_t *r)
+{
+    ngx_int_t   n;
+    ngx_str_t  *expect;
+
+    if (r->expect_tested
+        || r->headers_in.expect == NULL
+        || r->http_version < NGX_HTTP_VERSION_11)
+    {
+        return NGX_OK;
+    }
+
+    r->expect_tested = 1;
+
+    expect = &r->headers_in.expect->value;
+
+    if (expect->len != sizeof("100-continue") - 1
+        || ngx_strncasecmp(expect->data, (u_char *) "100-continue",
+                           sizeof("100-continue") - 1)
+           != 0)
+    {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "send 100 Continue");
+
+    n = r->connection->send(r->connection,
+                            (u_char *) "HTTP/1.1 100 Continue" CRLF CRLF,
+                            sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1);
+
+    if (n == sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1) {
+        return NGX_OK;
+    }
+
+    /* we assume that such small packet should be send successfully */
+
+    return NGX_ERROR;
+}
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_util.h b/debian/modules/nginx-lua/src/ngx_http_lua_util.h
index f704037..b32b8be 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.h
@@ -10,22 +10,67 @@
 #define NGX_UNESCAPE_URI_COMPONENT  0
 #endif
 
+/* char whose address we use as the key in Lua vm registry for
+ * user code cache table */
+extern char ngx_http_lua_code_cache_key;
+
+/* char whose address we use as the key in Lua vm registry for
+ * all the "ngx.ctx" tables */
+extern char ngx_http_lua_ctx_tables_key;
+
+/* char whose address we use as the key in Lua vm registry for
+ * regex cache table  */
+extern char ngx_http_lua_regex_cache_key;
+
+/* char whose address we use as the key in Lua vm registry for
+ * socket connection pool table */
+extern char ngx_http_lua_socket_pool_key;
+
+/* char whose address we use as the key for the nginx request pointer */
+extern char ngx_http_lua_request_key;
+
+/* char whose address we use as the key for the nginx config logger */
+extern char ngx_http_lua_cf_log_key;
+
+/* char whose address we use as the key for the coroutine parent relationship */
+extern char ngx_http_lua_coroutine_parents_key;
+
+/* coroutine anchoring table key in Lua VM registry */
+extern char ngx_http_lua_coroutines_key;
+
+/* key to the metatable for ngx.req.get_headers() */
+extern char ngx_http_lua_req_get_headers_metatable_key;
+
 
 #ifndef ngx_str_set
 #define ngx_str_set(str, text)                                               \
     (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text
 #endif
 
+
+#define ngx_http_lua_context_name(c)                                         \
+    ((c) == NGX_HTTP_LUA_CONTEXT_SET ? "set_by_lua*"                         \
+     : (c) == NGX_HTTP_LUA_CONTEXT_REWRITE ? "rewrite_by_lua*"               \
+     : (c) == NGX_HTTP_LUA_CONTEXT_ACCESS ? "access_by_lua*"                 \
+     : (c) == NGX_HTTP_LUA_CONTEXT_CONTENT ? "content_by_lua*"               \
+     : (c) == NGX_HTTP_LUA_CONTEXT_LOG ? "log_by_lua*"                       \
+     : (c) == NGX_HTTP_LUA_CONTEXT_HEADER_FILTER ? "header_filter_by_lua*"   \
+     : "(unknown)")
+
+
+#define ngx_http_lua_check_context(L, ctx, flags)                            \
+    if (!((ctx)->context & (flags))) {                                       \
+        return luaL_error(L, "API disabled in the context of %s",            \
+                          ngx_http_lua_context_name((ctx)->context));        \
+    }
+
+
 lua_State * ngx_http_lua_new_state(ngx_conf_t *cf,
     ngx_http_lua_main_conf_t *lmcf);
 
 lua_State * ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *l,
     int *ref);
 
-void ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *l, int ref);
-
-ngx_int_t ngx_http_lua_has_inline_var(ngx_str_t *s);
-
 u_char * ngx_http_lua_rebase_path(ngx_pool_t *pool, u_char *src, size_t len);
 
 ngx_int_t ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
@@ -54,10 +99,6 @@ ngx_int_t ngx_http_lua_wev_handler(ngx_http_request_t *r);
 u_char * ngx_http_lua_digest_hex(u_char *dest, const u_char *buf,
     int buf_len);
 
-void ngx_http_lua_dump_postponed(ngx_http_request_t *r);
-
-ngx_int_t ngx_http_lua_flush_postponed_outputs(ngx_http_request_t *r);
-
 void ngx_http_lua_set_multi_value_table(lua_State *L, int index);
 
 void ngx_http_lua_unescape_uri(u_char **dst, u_char **src, size_t size,
@@ -68,19 +109,72 @@ uintptr_t ngx_http_lua_escape_uri(u_char *dst, u_char *src,
 
 void ngx_http_lua_inject_req_api(ngx_log_t *log, lua_State *L);
 
-void ngx_http_lua_inject_req_api_no_io(ngx_log_t *log, lua_State *L);
-
 void ngx_http_lua_process_args_option(ngx_http_request_t *r,
     lua_State *L, int table, ngx_str_t *args);
 
 ngx_int_t ngx_http_lua_open_and_stat_file(u_char *name,
     ngx_open_file_info_t *of, ngx_log_t *log);
 
-void ngx_http_lua_inject_internal_utils(ngx_log_t *log, lua_State *L);
-
 ngx_chain_t * ngx_http_lua_chains_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
     ngx_chain_t **free, size_t len, ngx_buf_tag_t tag);
 
+void ngx_http_lua_create_new_global_table(lua_State *L, int narr, int nrec);
+
+int ngx_http_lua_traceback(lua_State *L);
+
+ngx_http_lua_co_ctx_t * ngx_http_lua_get_co_ctx(lua_State *L,
+    ngx_http_lua_ctx_t *ctx);
+
+ngx_http_lua_co_ctx_t * ngx_http_lua_create_co_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx);
+
+ngx_int_t ngx_http_lua_run_posted_threads(ngx_connection_t *c, lua_State *L,
+    ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx);
+
+ngx_int_t ngx_http_lua_post_thread(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t *coctx);
+
+void ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
+    ngx_http_lua_ctx_t *ctx, ngx_http_lua_co_ctx_t *coctx);
+
+void ngx_http_lua_rd_check_broken_connection(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_lua_test_expect(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_lua_check_broken_connection(ngx_http_request_t *r,
+    ngx_event_t *ev);
+
+
+
+#define ngx_http_lua_check_if_abortable(L, ctx)                             \
+    if ((ctx)->no_abort) {                                                  \
+        return luaL_error(L, "attempt to abort with pending subrequests");  \
+    }
+
+
+#define ngx_http_lua_init_ctx(ctx)                                          \
+    ngx_memzero(ctx, sizeof(ngx_http_lua_ctx_t));                           \
+    ctx->ctx_ref = LUA_NOREF;                                               \
+    ctx->entry_co_ctx.co_ref = LUA_NOREF;                                   \
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+
+
+static ngx_inline ngx_http_lua_ctx_t *
+ngx_http_lua_create_ctx(ngx_http_request_t *r)
+{
+    ngx_http_lua_ctx_t      *ctx;
+
+    ctx = ngx_palloc(r->pool, sizeof(ngx_http_lua_ctx_t));
+    if (ctx == NULL) {
+        return NULL;
+    }
+
+    ngx_http_lua_init_ctx(ctx);
+
+    ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
+    return ctx;
+}
+
 
 #endif /* NGX_HTTP_LUA_UTIL_H */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_variable.c b/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
index 3824a40..cbde7ec 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
@@ -4,6 +4,7 @@
 #include "ddebug.h"
 
 #include "ngx_http_lua_variable.h"
+#include "ngx_http_lua_util.h"
 
 
 static int ngx_http_lua_var_get(lua_State *L);
@@ -51,7 +52,8 @@ ngx_http_lua_var_get(lua_State *L)
     int                         *cap;
 #endif
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
@@ -141,7 +143,8 @@ ngx_http_lua_var_set(lua_State *L)
     int                          value_type;
     const char                  *msg;
 
-    lua_getglobal(L, GLOBALS_SYMBOL_REQUEST);
+    lua_pushlightuserdata(L, &ngx_http_lua_request_key);
+    lua_rawget(L, LUA_GLOBALSINDEX);
     r = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
diff --git a/debian/modules/nginx-lua/t/.gitignore b/debian/modules/nginx-lua/t/.gitignore
new file mode 100644
index 0000000..3170741
--- /dev/null
+++ b/debian/modules/nginx-lua/t/.gitignore
@@ -0,0 +1,2 @@
+servroot
+
diff --git a/debian/modules/nginx-lua/t/001-set.t b/debian/modules/nginx-lua/t/001-set.t
index bd390ae..80dd24b 100644
--- a/debian/modules/nginx-lua/t/001-set.t
+++ b/debian/modules/nginx-lua/t/001-set.t
@@ -4,9 +4,8 @@ use lib 'lib';
 use Test::Nginx::Socket;
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 3);
+plan tests => repeat_each() * (blocks() * 3 + 4);
 
 #log_level("warn");
 no_long_string();
@@ -25,6 +24,8 @@ __DATA__
 GET /lua
 --- response_body
 2
+--- no_error_log
+[error]
 
 
 
@@ -38,6 +39,8 @@ GET /lua
 GET /lua
 --- response_body
 helloworld
+--- no_error_log
+[error]
 
 
 
@@ -51,19 +54,23 @@ helloworld
 GET /lua
 --- response_body
 55
+--- no_error_log
+[error]
 
 
 
 === TEST 4: inlined script with arguments
 --- config
     location /lua {
-        set_by_lua $res "return ngx.arg[1]+ngx.arg[2]" $arg_a $arg_b;
+        set_by_lua $res "return ngx.arg[1] + ngx.arg[2]" $arg_a $arg_b;
         echo $res;
     }
 --- request
 GET /lua?a=1&b=2
 --- response_body
 3
+--- no_error_log
+[error]
 
 
 
@@ -77,6 +84,8 @@ GET /lua?a=1&b=2
 GET /fib?n=10
 --- response_body
 55
+--- no_error_log
+[error]
 
 
 
@@ -94,6 +103,8 @@ GET /fib?n=10
 GET /adder?a=25&b=75
 --- response_body
 100
+--- no_error_log
+[error]
 
 
 
@@ -109,6 +120,8 @@ GET /adder?a=25&b=75
 GET /set-both
 --- response_body
 a = 33
+--- no_error_log
+[error]
 
 
 
@@ -126,6 +139,8 @@ GET /set-both
 --- response_body
 a = 7
 b = 32
+--- no_error_log
+[error]
 
 
 
@@ -141,6 +156,8 @@ b = 32
 GET /set-both
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+varaible "b" not found for writing; maybe it is a built-in variable that is not changeable or you sould have used "set $b '';" earlier in the config file
 
 
 
@@ -155,6 +172,8 @@ GET /set-both
 GET /set
 --- response_body
 ''
+--- no_error_log
+[error]
 
 
 
@@ -168,6 +187,8 @@ GET /set
 GET /md5
 --- response_body
 5d41402abc4b2a76b9719d911017c592
+--- no_error_log
+[error]
 
 
 
@@ -181,6 +202,8 @@ GET /md5
 GET /lua
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
 
 
 
@@ -194,10 +217,230 @@ GET /lua
 GET /lua
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
 
 
 
-=== TEST 14: set $limit_rate (variables with set_handler)
+=== TEST 14: no ngx.flush
+--- config
+    location /lua {
+        set_by_lua $res "ngx.flush()";
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 15: no ngx.eof
+--- config
+    location /lua {
+        set_by_lua $res "ngx.eof()";
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 16: no ngx.send_headers
+--- config
+    location /lua {
+        set_by_lua $res "ngx.send_headers()";
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 17: no ngx.location.capture
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.location.capture("/sub")';
+        echo $res;
+    }
+
+    location /sub {
+        echo sub;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 18: no ngx.location.capture_multi
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.location.capture_multi{{"/sub"}}';
+        echo $res;
+    }
+
+    location /sub {
+        echo sub;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 19: no ngx.exit
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.exit(0)';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 20: no ngx.redirect
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.redirect("/blah")';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 21: no ngx.exec
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.exec("/blah")';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 22: no ngx.req.set_uri(uri, true)
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.req.set_uri("/blah", true)';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 23: ngx.req.set_uri(uri) exists
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.req.set_uri("/blah") return 1';
+        echo $uri;
+    }
+--- request
+GET /lua
+--- response_body
+/blah
+--- no_error_log
+[error]
+
+
+
+=== TEST 24: no ngx.req.read_body()
+--- config
+    location /lua {
+        set_by_lua $res 'ngx.req.read_body()';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 25: no ngx.req.socket()
+--- config
+    location /lua {
+        set_by_lua $res 'return ngx.req.socket()';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 26: no ngx.socket.tcp()
+--- config
+    location /lua {
+        set_by_lua $res 'return ngx.socket.tcp()';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 27: no ngx.socket.connect()
+--- config
+    location /lua {
+        set_by_lua $res 'return ngx.socket.connect("127.0.0.1", 80)';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+API disabled in the context of set_by_lua*
+
+
+
+=== TEST 28: set $limit_rate (variables with set_handler)
 --- config
     location /lua {
         set $limit_rate 1000;
@@ -210,10 +453,12 @@ GET /lua
     GET /lua
 --- response_body
 limit rate = 180
+--- no_error_log
+[error]
 
 
 
-=== TEST 15: set $args and read $query_string
+=== TEST 29: set $args and read $query_string
 --- config
     location /lua {
         set $args 'hello';
@@ -226,10 +471,12 @@ limit rate = 180
     GET /lua
 --- response_body
 world
+--- no_error_log
+[error]
 
 
 
-=== TEST 16: set $arg_xxx
+=== TEST 30: set $arg_xxx
 --- config
     location /lua {
         rewrite_by_lua '
@@ -241,10 +488,12 @@ world
     GET /lua?foo=3
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+varaible "arg_foo" not found for writing; maybe it is a built-in variable that is not changeable or you sould have used "set $arg_foo '';" earlier in the config file
 
 
 
-=== TEST 17: symbol $ in lua code of set_by_lua
+=== TEST 31: symbol $ in lua code of set_by_lua
 --- config
     location /lua {
         set_by_lua $res 'return "$unknown"';
@@ -254,10 +503,12 @@ world
     GET /lua
 --- response_body
 $unknown
+--- no_error_log
+[error]
 
 
 
-=== TEST 18: symbol $ in lua code of set_by_lua_file
+=== TEST 32: symbol $ in lua code of set_by_lua_file
 --- config
     location /lua {
         set_by_lua_file $res html/a.lua;
@@ -275,7 +526,7 @@ $unknown
 
 
 
-=== TEST 19: external script files with arguments
+=== TEST 33: external script files with arguments
 --- config
     location /lua {
         set_by_lua_file $res html/a.lua $arg_a $arg_b;
@@ -283,7 +534,7 @@ $unknown
     }
 --- user_files
 >>> a.lua
-return ngx.arg[1]+ngx.arg[2]
+return ngx.arg[1] + ngx.arg[2]
 --- request
 GET /lua?a=5&b=2
 --- response_body
@@ -293,7 +544,7 @@ GET /lua?a=5&b=2
 
 
 
-=== TEST 20: variables in set_by_lua_file's file path
+=== TEST 34: variables in set_by_lua_file's file path
 --- config
     location /lua {
         set $path "html/a.lua";
@@ -302,7 +553,7 @@ GET /lua?a=5&b=2
     }
 --- user_files
 >>> a.lua
-return ngx.arg[1]+ngx.arg[2]
+return ngx.arg[1] + ngx.arg[2]
 --- request
 GET /lua?a=5&b=2
 --- response_body
@@ -310,3 +561,221 @@ GET /lua?a=5&b=2
 --- no_error_log
 [error]
 
+
+
+=== TEST 35: lua error (string)
+--- config
+    location /lua {
+        set_by_lua $res 'error("Bad")';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+failed to run set_by_lua*: [string "set_by_lua"]:1: Bad
+
+
+
+=== TEST 36: lua error (nil)
+--- config
+    location /lua {
+        set_by_lua $res 'error(nil)';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+failed to run set_by_lua*: unknown reason
+
+
+
+=== TEST 37: globals get cleared for every single request
+--- config
+    location /lua {
+        set_by_lua $res '
+            if not foo then
+                foo = 1
+            else
+                foo = foo + 1
+            end
+            return foo
+        ';
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body
+1
+--- no_error_log
+[error]
+
+
+
+=== TEST 38: user modules using ngx.arg
+--- http_config
+    lua_package_path "$prefix/html/?.lua;;";
+--- config
+    location /lua {
+        set_by_lua $res 'local foo = require "foo" return foo.go()' $arg_a $arg_b;
+        echo $res;
+    }
+--- user_files
+>>> foo.lua
+module("foo", package.seeall)
+
+function go()
+    return ngx.arg[1] + ngx.arg[2]
+end
+--- request
+GET /lua?a=1&b=2
+--- response_body
+3
+--- no_error_log
+[error]
+
+
+
+=== TEST 39: server scope (inline)
+--- config
+    location /lua {
+        set $a "[$res]";
+        echo $a;
+    }
+    set_by_lua $res "return 1+1";
+--- request
+GET /lua
+--- response_body
+[2]
+--- no_error_log
+[error]
+
+
+
+=== TEST 40: server if scope (inline)
+--- config
+    location /lua {
+        set $a "[$res]";
+        echo $a;
+    }
+    if ($arg_name = "jim") {
+        set_by_lua $res "return 1+1";
+    }
+--- request
+GET /lua?name=jim
+--- response_body
+[2]
+--- no_error_log
+[error]
+
+
+
+=== TEST 41: location if scope (inline)
+--- config
+    location /lua {
+        if ($arg_name = "jim") {
+            set_by_lua $res "return 1+1";
+            set $a "[$res]";
+            echo $a;
+        }
+    }
+--- request
+GET /lua?name=jim
+--- response_body
+[2]
+--- no_error_log
+[error]
+
+
+
+=== TEST 42: server scope (file)
+--- config
+    location /lua {
+        set $a "[$res]";
+        echo $a;
+    }
+    set_by_lua_file $res html/a.lua;
+--- user_files
+>>> a.lua
+return 1+1
+--- request
+GET /lua
+--- response_body
+[2]
+--- no_error_log
+[error]
+
+
+
+=== TEST 43: server if scope (file)
+--- config
+    location /lua {
+        set $a "[$res]";
+        echo $a;
+    }
+    if ($arg_name = "jim") {
+        set_by_lua_file $res html/a.lua;
+    }
+--- request
+GET /lua?name=jim
+--- user_files
+>>> a.lua
+return 1+1
+--- response_body
+[2]
+--- no_error_log
+[error]
+
+
+
+=== TEST 44: location if scope (file)
+--- config
+    location /lua {
+        if ($arg_name = "jim") {
+            set_by_lua_file $res html/a.lua;
+            set $a "[$res]";
+            echo $a;
+        }
+    }
+--- user_files
+>>> a.lua
+return 1+1
+--- request
+GET /lua?name=jim
+--- response_body
+[2]
+--- no_error_log
+[error]
+
+
+
+=== TEST 45: backtrace
+--- config
+    location /t {
+        set_by_lua $a '
+            function foo()
+                bar()
+            end
+
+            function bar()
+                error("something bad happened")
+            end
+
+            foo()
+        ';
+        echo ok;
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+something bad happened
+stack traceback:
+in function 'error'
+in function 'bar'
+in function 'foo'
+
diff --git a/debian/modules/nginx-lua/t/002-content.t b/debian/modules/nginx-lua/t/002-content.t
index d624b17..7b6734f 100644
--- a/debian/modules/nginx-lua/t/002-content.t
+++ b/debian/modules/nginx-lua/t/002-content.t
@@ -662,3 +662,27 @@ hello,
 world
 --- timeout: 5
 
+
+
+=== TEST 36: ngx.print table arguments (github issue #54)
+--- config
+    location /t {
+        content_by_lua 'ngx.print({10, {0, 5}, 15}, 32)';
+    }
+--- request
+    GET /t
+--- response_body chop
+10051532
+
+
+
+=== TEST 37: ngx.say table arguments (github issue #54)
+--- config
+    location /t {
+        content_by_lua 'ngx.say({10, {0, "5"}, 15}, 32)';
+    }
+--- request
+    GET /t
+--- response_body
+10051532
+
diff --git a/debian/modules/nginx-lua/t/005-exit.t b/debian/modules/nginx-lua/t/005-exit.t
index be4579d..68f226f 100644
--- a/debian/modules/nginx-lua/t/005-exit.t
+++ b/debian/modules/nginx-lua/t/005-exit.t
@@ -11,12 +11,12 @@ repeat_each(2);
 #log_level('warn');
 #worker_connections(1024);
 
-plan tests => repeat_each() * (blocks() * 3 - 1);
+plan tests => repeat_each() * (blocks() * 3 + 3);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
-$ENV{LUA_CPATH} ||=
+our $LuaCpath = $ENV{LUA_CPATH} ||
     '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
@@ -63,10 +63,11 @@ GET /lua
 --- request
 GET /lua
 --- error_log
-attempt to call ngx.exit after sending out the headers
+attempt to set status 404 via ngx.exit after sending out the response status 200
 --- no_error_log
 alert
---- ignore_response
+--- response_body
+hi
 
 
 
@@ -122,13 +123,15 @@ GET /api?user=agentz
 
 
 === TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
-
+"
 --- config
     location /memc {
         internal;
@@ -192,13 +195,15 @@ Logged in 56
 
 
 === TEST 7: working with ngx_auth_request (simplest form)
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
-
+"
 --- config
     location /memc {
         internal;
@@ -262,23 +267,25 @@ Logged in 56
 
 
 === TEST 8: working with ngx_auth_request
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
 
     upstream memc_a {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
     }
 
     upstream memc_b {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
     }
 
     upstream_list memc_cluster memc_a memc_b;
-
+"
 --- config
     location /memc {
         internal;
@@ -339,6 +346,7 @@ GET /api?uid=32
 Logged in 56
 --- no_error_log
 [error]
+--- timeout: 5
 
 
 
@@ -494,3 +502,44 @@ GET /lua
 --- no_error_log
 [error]
 
+
+
+=== TEST 14: throw 403 after sending out headers with 200
+--- config
+    location /lua {
+        rewrite_by_lua '
+            ngx.send_headers()
+            ngx.say("Hello World")
+            ngx.exit(403)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+Hello World
+--- error_log
+attempt to set status 403 via ngx.exit after sending out the response status 200
+--- no_error_log
+[alert]
+
+
+
+=== TEST 15: throw 403 after sending out headers with 403
+--- config
+    location /lua {
+        rewrite_by_lua '
+            ngx.status = 403
+            ngx.send_headers()
+            ngx.say("Hello World")
+            ngx.exit(403)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+Hello World
+--- error_code: 403
+--- no_error_log
+[error]
+[alert]
+
diff --git a/debian/modules/nginx-lua/t/009-log.t b/debian/modules/nginx-lua/t/009-log.t
index 3758bb8..17d542b 100644
--- a/debian/modules/nginx-lua/t/009-log.t
+++ b/debian/modules/nginx-lua/t/009-log.t
@@ -8,7 +8,7 @@ log_level('debug'); # to ensure any log-level can be outputed
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 3);
+plan tests => repeat_each() * (blocks() * 3 + 4);
 
 #no_diff();
 #no_long_string();
@@ -401,3 +401,56 @@ done
 --- error_log eval
 qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
 
+
+
+=== TEST 20: ngx.log with bad levels (ngx.ERROR, -1)
+--- config
+    location /log {
+        content_by_lua '
+            ngx.log(ngx.ERROR, "hello lua")
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /log
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad log level: -1
+
+
+
+=== TEST 21: ngx.log with bad levels (9)
+--- config
+    location /log {
+        content_by_lua '
+            ngx.log(9, "hello lua")
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /log
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad log level: 9
+
+
+
+=== TEST 22: \0 in the log message
+--- config
+    location = /t {
+        content_by_lua '
+            ngx.log(ngx.WARN, "hello\\0world")
+            ngx.say("ok")
+        ';
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- error_log eval
+"2: hello\0world, client: "
+
diff --git a/debian/modules/nginx-lua/t/014-bugs.t b/debian/modules/nginx-lua/t/014-bugs.t
index cef7326..4b87103 100644
--- a/debian/modules/nginx-lua/t/014-bugs.t
+++ b/debian/modules/nginx-lua/t/014-bugs.t
@@ -7,21 +7,21 @@ use Test::Nginx::Socket;
 #master_on();
 log_level('debug');
 
-#repeat_each(120);
 repeat_each(3);
 
-plan tests => repeat_each() * (blocks() * 2 + 2);
+plan tests => repeat_each() * (blocks() * 2 + 21);
 
 our $HtmlDir = html_dir;
 #warn $html_dir;
 
-$ENV{LUA_CPATH} = "/home/lz/luax/?.so;;";
-
 #no_diff();
 #no_long_string();
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
+#no_shuffle();
+no_long_string();
+
 run_tests();
 
 __DATA__
@@ -561,3 +561,166 @@ $s
 24
 25
 
+
+
+=== TEST 26: unexpected globals sharing by using _G
+--- config
+    location /test {
+        content_by_lua '
+            if _G.t then
+                _G.t = _G.t + 1
+            else
+                _G.t = 0
+            end
+            ngx.print(t)
+        ';
+    }
+--- pipelined_requests eval
+["GET /test", "GET /test", "GET /test"]
+--- response_body eval
+["0", "0", "0"]
+
+
+
+=== TEST 27: unexpected globals sharing by using _G (set_by_lua*)
+--- config
+    location /test {
+        set_by_lua $a '
+            if _G.t then
+                _G.t = _G.t + 1
+            else
+                _G.t = 0
+            end
+            return t
+        ';
+        echo -n $a;
+    }
+--- pipelined_requests eval
+["GET /test", "GET /test", "GET /test"]
+--- response_body eval
+["0", "0", "0"]
+
+
+
+=== TEST 28: unexpected globals sharing by using _G (log_by_lua*)
+--- http_config
+    lua_shared_dict log_dict 100k;
+--- config
+    location /test {
+        content_by_lua '
+            local log_dict = ngx.shared.log_dict
+            ngx.print(log_dict:get("cnt") or 0)
+        ';
+
+        log_by_lua '
+            local log_dict = ngx.shared.log_dict
+            if _G.t then
+                _G.t = _G.t + 1
+            else
+                _G.t = 0
+            end
+            log_dict:set("cnt", t)
+        ';
+    }
+--- pipelined_requests eval
+["GET /test", "GET /test", "GET /test"]
+--- response_body eval
+["0", "0", "0"]
+
+
+
+=== TEST 29: unexpected globals sharing by using _G (header_filter_by_lua*)
+--- config
+    location /test {
+        header_filter_by_lua '
+            if _G.t then
+                _G.t = _G.t + 1
+            else
+                _G.t = 0
+            end
+            ngx.ctx.cnt = tostring(t)
+        ';
+        content_by_lua '
+            ngx.send_headers()
+            ngx.print(ngx.ctx.cnt or 0)
+        ';
+    }
+--- pipelined_requests eval
+["GET /test", "GET /test", "GET /test"]
+--- response_body eval
+["0", "0", "0"]
+
+
+
+=== TEST 30: unexpected globals sharing by using _G (body_filter_by_lua*)
+--- config
+    location /test {
+        body_filter_by_lua '
+            if _G.t then
+                _G.t = _G.t + 1
+            else
+                _G.t = 0
+            end
+            ngx.ctx.cnt = _G.t
+        ';
+        content_by_lua '
+            ngx.print("a")
+            ngx.say(ngx.ctx.cnt or 0)
+        ';
+    }
+--- request
+GET /test
+--- response_body
+a0
+--- no_error_log
+[error]
+
+
+
+=== TEST 31: set content-type header with charset and default_type
+--- http_config
+--- config
+    location /lua {
+        default_type application/json;
+        charset utf-8;
+        charset_types application/json;
+        content_by_lua 'ngx.say("hi")';
+    }
+--- request
+    GET /lua
+--- response_body
+hi
+--- response_headers
+Content-Type: application/json; charset=utf-8
+
+
+
+=== TEST 32: hang on upstream_next (from kindy)
+--- http_config
+    upstream xx {
+        server 127.0.0.1:$TEST_NGINX_SERVER_PORT;
+        server 127.0.0.1:$TEST_NGINX_SERVER_PORT;
+    }
+
+    server {
+        server_name "xx";
+        listen $TEST_NGINX_SERVER_PORT;
+
+        return 444;
+    }
+--- config
+    location = /t {
+        proxy_pass http://xx;
+    }
+
+    location = /bad {
+        return 444;
+    }
+--- request
+    GET /t
+--- timeout: 1
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log
+upstream prematurely closed connection while reading response header from upstream
+
diff --git a/debian/modules/nginx-lua/t/015-status.t b/debian/modules/nginx-lua/t/015-status.t
index f865266..a97b516 100644
--- a/debian/modules/nginx-lua/t/015-status.t
+++ b/debian/modules/nginx-lua/t/015-status.t
@@ -5,12 +5,12 @@ use Test::Nginx::Socket;
 
 #worker_connections(1014);
 #master_process_enabled(1);
-#log_level('warn');
+log_level('warn');
 
 #repeat_each(120);
-repeat_each(1);
+repeat_each(2);
 
-plan tests => blocks() * repeat_each() * 2;
+plan tests => repeat_each() * (blocks() * 2 + 1);
 
 #no_diff();
 #no_long_string();
@@ -153,3 +153,21 @@ GET /201
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 
+
+
+=== TEST 10: set ngx.status before headers are sent
+--- config
+    location /t {
+        content_by_lua '
+            ngx.say("ok")
+            ngx.status = 201
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+ok
+--- error_code: 200
+--- error_log eval
+qr/\[error\] .*? attempt to set ngx\.status after sending out response headers/
+
diff --git a/debian/modules/nginx-lua/t/016-resp-header.t b/debian/modules/nginx-lua/t/016-resp-header.t
index da4978b..7a1a5ef 100644
--- a/debian/modules/nginx-lua/t/016-resp-header.t
+++ b/debian/modules/nginx-lua/t/016-resp-header.t
@@ -74,13 +74,13 @@ Hel
     location /read {
         content_by_lua '
             ngx.status = 302;
-            ngx.header["Location"] = "http://www.taobao.com/foo";
+            ngx.header["Location"] = "http://google.com/foo";
         ';
     }
 --- request
 GET /read
 --- response_headers
-Location: http://www.taobao.com/foo
+Location: http://google.com/foo
 --- response_body
 --- error_code: 302
 
@@ -783,3 +783,43 @@ Content-Type: text/plain
 --- response_body
 Hello, world, my dear friend!
 
+
+
+=== TEST 40: no transform underscores (write)
+--- config
+    lua_transform_underscores_in_response_headers off;
+    location = /t {
+        content_by_lua '
+            ngx.header.foo_bar = "Hello"
+            ngx.say(ngx.header.foo_bar)
+            ngx.say(ngx.header["foo-bar"])
+        ';
+    }
+--- request
+    GET /t
+--- raw_response_headers_like eval
+"\r\nfoo_bar: Hello\r\n"
+--- response_body
+Hello
+nil
+
+
+
+=== TEST 41: with transform underscores (write)
+--- config
+    lua_transform_underscores_in_response_headers on;
+    location = /t {
+        content_by_lua '
+            ngx.header.foo_bar = "Hello"
+            ngx.say(ngx.header.foo_bar)
+            ngx.say(ngx.header["foo-bar"])
+        ';
+    }
+--- request
+    GET /t
+--- raw_response_headers_like eval
+"\r\nfoo-bar: Hello\r\n"
+--- response_body
+Hello
+Hello
+
diff --git a/debian/modules/nginx-lua/t/017-exec.t b/debian/modules/nginx-lua/t/017-exec.t
index 1b5a9a4..b043360 100644
--- a/debian/modules/nginx-lua/t/017-exec.t
+++ b/debian/modules/nginx-lua/t/017-exec.t
@@ -5,13 +5,14 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => blocks() * repeat_each() * 2;
-
-#no_diff();
-#no_long_string();
+plan tests => repeat_each() * (blocks() * 2 + 4);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
+#no_diff();
+#no_shuffle();
+#no_long_string();
+
 run_tests();
 
 __DATA__
@@ -539,6 +540,7 @@ hello
         proxy_pass http://127.0.0.1:$server_port/foo;
     }
     location /foo {
+        #echo_status 201;
         echo bah;
     }
 --- request
@@ -546,3 +548,29 @@ hello
 --- response_body
 hello, bah
 
+
+
+=== TEST 24: jump to an internal location
+--- config
+    location /t {
+        content_by_lua '
+            return ngx.exec("/proxy", ngx.var.args)
+        ';
+    }
+
+    location /proxy {
+        internal;
+
+        proxy_pass http://127.0.0.1:$server_port/dummy;
+    }
+
+    location = /dummy {
+        echo -n dummy;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t?foo"]
+--- response_body eval
+["dummy", "dummy"]
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/018-ndk.t b/debian/modules/nginx-lua/t/018-ndk.t
index 02d0fd5..52bc761 100644
--- a/debian/modules/nginx-lua/t/018-ndk.t
+++ b/debian/modules/nginx-lua/t/018-ndk.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 #no_diff();
 #no_long_string();
@@ -97,3 +97,55 @@ GET /luaset
 68o32c9e64o2sc9j5co30c1g
 '2011.10.13+0000'
 
+
+
+=== TEST 6: set_by_lua
+--- config
+    location /read {
+        set_by_lua $r '
+            return ndk.set_var.set_unescape_uri("a%20b")
+        ';
+        echo $r;
+    }
+--- request
+GET /read
+--- response_body
+a b
+
+
+
+=== TEST 7: header_filter_by_lua
+--- config
+    location /read {
+        set $foo '';
+        content_by_lua '
+            ngx.send_headers()
+            ngx.say(ngx.var.foo)
+        ';
+        header_filter_by_lua '
+            ngx.var.foo = ndk.set_var.set_unescape_uri("a%20b")
+        ';
+    }
+--- request
+GET /read
+--- response_body
+a b
+
+
+
+=== TEST 8: log_by_lua
+--- config
+    location /read {
+        echo ok;
+        log_by_lua '
+            local foo = ndk.set_var.set_unescape_uri("a%20b")
+            ngx.log(ngx.WARN, "foo = ", foo)
+        ';
+    }
+--- request
+GET /read
+--- response_body
+ok
+--- error_log
+foo = a b
+
diff --git a/debian/modules/nginx-lua/t/020-subrequest.t b/debian/modules/nginx-lua/t/020-subrequest.t
index 3e6b072..921bdb0 100644
--- a/debian/modules/nginx-lua/t/020-subrequest.t
+++ b/debian/modules/nginx-lua/t/020-subrequest.t
@@ -3,19 +3,21 @@ use lib 'lib';
 use Test::Nginx::Socket;
 
 #master_on();
-workers(1);
+#workers(1);
 #worker_connections(1014);
 #log_level('warn');
 #master_process_enabled(1);
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 8);
+plan tests => repeat_each() * (blocks() * 3 + 10);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
 #no_diff();
-#no_long_string();
+no_long_string();
+#no_shuffle();
+
 run_tests();
 
 __DATA__
@@ -39,6 +41,8 @@ __DATA__
 GET /lua
 --- response_body
 DELETE
+--- no_error_log
+[error]
 
 
 
@@ -65,6 +69,8 @@ DELETE
 GET /lua
 --- response_body
 DELETE
+--- no_error_log
+[error]
 
 
 
@@ -79,7 +85,7 @@ DELETE
         proxy_pass http://127.0.0.1:$server_port/other;
     }
 
-    location /lua {
+    location /t {
         content_by_lua '
             res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
@@ -88,9 +94,11 @@ DELETE
         ';
     }
 --- request
-GET /lua
+GET /t
 --- response_body
 POST
+--- no_error_log
+[error]
 
 
 
@@ -113,6 +121,8 @@ POST
 GET /lua
 --- response_body
 HEAD
+--- no_error_log
+[error]
 
 
 
@@ -139,6 +149,8 @@ HEAD
 GET /lua
 --- response_body
 GET
+--- no_error_log
+[error]
 
 
 
@@ -164,6 +176,8 @@ GET
 GET /lua
 --- response_body
 GET
+--- no_error_log
+[error]
 
 
 
@@ -189,6 +203,8 @@ GET
 GET /lua
 --- response_body
 GET
+--- no_error_log
+[error]
 
 
 
@@ -219,6 +235,8 @@ GET /lua
 --- response_body chomp
 PUT
 hello
+--- no_error_log
+[error]
 
 
 
@@ -246,6 +264,8 @@ GET /lua
 --- response_body chomp
 PUT
 hello
+--- no_error_log
+[error]
 
 
 
@@ -286,6 +306,8 @@ PUT
 hello
 GET
 []
+--- no_error_log
+[error]
 
 
 
@@ -316,6 +338,8 @@ GET /lua
 --- response_body chomp
 POST
 hello
+--- no_error_log
+[error]
 
 
 
@@ -354,6 +378,8 @@ GET /lua
 GET: 404
 PUT: 201
 cached: hello
+--- no_error_log
+[error]
 
 
 
@@ -394,6 +420,8 @@ GET /lua
 GET: 404
 PUT: 201
 cached: hello
+--- no_error_log
+[error]
 
 
 
@@ -413,6 +441,8 @@ cached: hello
 --- request
 GET /lua
 --- response_body eval: "\n"
+--- no_error_log
+[error]
 
 
 
@@ -433,6 +463,8 @@ GET /lua
 GET /lua
 --- response_body
 fo%3d=%3d%3e
+--- no_error_log
+[error]
 
 
 
@@ -454,6 +486,10 @@ fo%3d=%3d%3e
 GET /lua
 --- response_body_like chop
 ^(?:fo%3d=%3d%3e\&%3d=%3a|%3d=%3a\&fo%3d=%3d%3e)$
+--- no_error_log
+[error]
+--- no_error_log
+[error]
 
 
 
@@ -475,6 +511,8 @@ GET /lua
 GET /lua
 --- response_body_like chop
 ^(?:bar=hello\&foo=3|foo=3\&bar=hello)$
+--- no_error_log
+[error]
 
 
 
@@ -495,6 +533,8 @@ GET /lua
 GET /lua
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+attempt to use a non-string key in the "args" option table
 
 
 
@@ -515,6 +555,8 @@ GET /lua
 GET /lua
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+attempt to use a non-string key in the "args" option table
 
 
 
@@ -535,6 +577,8 @@ GET /lua
 GET /lua
 --- response_body
 a=3&b=4
+--- no_error_log
+[error]
 
 
 
@@ -555,6 +599,8 @@ a=3&b=4
 GET /lua
 --- response_body
 a=3&b=4
+--- no_error_log
+[error]
 
 
 
@@ -573,6 +619,8 @@ a=3&b=4
     GET /lua
 --- response_body
 main req
+--- no_error_log
+[error]
 
 
 
@@ -595,6 +643,8 @@ main req
     GET /main
 --- response_body
 sub req
+--- no_error_log
+[error]
 
 
 
@@ -618,6 +668,8 @@ sub req
     GET /main
 --- response_body
 sub req
+--- no_error_log
+[error]
 
 
 
@@ -642,6 +694,8 @@ GET /lua
 Foo: bar
 --- response_body
 header foo: [bar]
+--- no_error_log
+[error]
 
 
 
@@ -666,6 +720,8 @@ GET /lua
 Foo: bar
 --- response_body
 header foo: [bar]
+--- no_error_log
+[error]
 
 
 
@@ -701,6 +757,8 @@ hello, b
 hello, c
 --- error_log
 lua reuse free buf memory
+--- no_error_log
+[error]
 
 
 
@@ -732,6 +790,8 @@ hi
 --- response_body chomp
 POST
 hello
+--- no_error_log
+[error]
 
 
 
@@ -755,6 +815,8 @@ hello, static file
 ^200
 [A-Za-z]+, \d{1,2} [A-Za-z]+ \d{4} \d{2}:\d{2}:\d{2} GMT
 hello, static file$
+--- no_error_log
+[error]
 
 
 
@@ -779,6 +841,8 @@ GET /lua
 --- response_body
 bar
 nil
+--- no_error_log
+[error]
 
 
 
@@ -799,6 +863,8 @@ nil
 GET /lua
 --- response_body
 bar
+--- no_error_log
+[error]
 
 
 
@@ -806,7 +872,7 @@ bar
 --- http_config
     upstream memc {
         server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-        keepalive 100 single;
+        keepalive 100;
     }
 --- config
     location /memc {
@@ -1045,3 +1111,581 @@ hello world
 --- no_error_log
 [error]
 
+
+
+=== TEST 40: encode args table with a multi-value arg.
+--- config
+    location /t {
+        content_by_lua '
+            local args = ngx.req.get_uri_args()
+            local res = ngx.location.capture("/sub", { args = args })
+            ngx.print(res.body)
+        ';
+    }
+
+    location /sub {
+        echo $query_string;
+    }
+--- request
+GET /t?r[]=http%3A%2F%2Fajax.googleapis.com%3A80%2Fajax%2Flibs%2Fjquery%2F1.7.2%2Fjquery.min.js&r[]=http%3A%2F%2Fajax.googleapis.com%3A80%2Fajax%2Flibs%2Fdojo%2F1.7.2%2Fdojo%2Fdojo.js.uncompressed.js
+--- response_body
+r%5b%5d=http%3a%2f%2fajax.googleapis.com%3a80%2fajax%2flibs%2fjquery%2f1.7.2%2fjquery.min.js&r%5b%5d=http%3a%2f%2fajax.googleapis.com%3a80%2fajax%2flibs%2fdojo%2f1.7.2%2fdojo%2fdojo.js.uncompressed.js
+--- no_error_log
+[error]
+
+
+
+=== TEST 41: subrequests finalized with NGX_ERROR
+--- config
+    location /sub {
+        content_by_lua '
+            ngx.exit(ngx.ERROR)
+        ';
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/sub")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- response_body
+status: 500
+body: 
+
+
+
+=== TEST 42: subrequests finalized with 500
+--- config
+    location /sub {
+        return 500;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/sub")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- response_body
+status: 500
+body: 
+
+
+
+=== TEST 43: subrequests with an output body filter returning NGX_ERROR
+--- config
+    location /sub {
+        echo hello world;
+        body_filter_by_lua '
+            return ngx.ERROR
+        ';
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/sub")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- stap2
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+--- response_body
+--- error_code
+--- no_error_log
+[error]
+
+
+
+=== TEST 44: subrequests truncated in its response body due to premature connection close (nonbuffered)
+--- config
+    server_tokens off;
+    location /memc {
+        internal;
+
+        set $memc_key 'foo';
+        #set $memc_exptime 300;
+        memc_pass 127.0.0.1:19112; #$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/memc")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19112
+--- tcp_query_len: 9
+--- tcp_reply eval
+"VALUE foo 0 1024\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+upstream fin req: error=0 eof=1 rc=502
+post subreq: rc=0, status=502
+
+--- response_body
+status: 502
+body: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 45: subrequests truncated in its response body due to upstream read timeout (nonbuffered)
+--- config
+    memc_read_timeout 100ms;
+    location /memc {
+        internal;
+
+        set $memc_key 'foo';
+        #set $memc_exptime 300;
+        memc_pass 127.0.0.1:19112; #$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/memc")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19112
+--- tcp_no_close
+--- tcp_reply eval
+"VALUE foo 0 1024\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+conn err: 110: upstream timed out
+upstream fin req: error=0 eof=0 rc=504
+post subreq: rc=0, status=504
+
+--- response_body_like chop
+^status: 504
+body: 
+
+--- error_log
+upstream timed out
+
+
+
+=== TEST 46: subrequests truncated in its response body due to premature connection close (buffered)
+--- config
+    server_tokens off;
+
+    location /proxy {
+        internal;
+
+        #proxy_read_timeout 100ms;
+        proxy_buffering on;
+        proxy_pass http://127.0.0.1:19113;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/proxy")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19113
+--- tcp_query_len: 65
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\nContent-Length: 1024\r\n\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+upstream fin req: error=0 eof=1 rc=502
+post subreq: rc=0, status=502
+
+--- response_body
+status: 502
+body: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 47: subrequests truncated in its response body due to read timeout (buffered)
+--- config
+    location /proxy {
+        internal;
+
+        proxy_read_timeout 100ms;
+        proxy_buffering on;
+        proxy_pass http://127.0.0.1:19113;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/proxy")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19113
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\nContent-Length: 1024\r\n\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+conn err: 110: upstream timed out
+upstream fin req: error=0 eof=0 rc=502
+post subreq: rc=0, status=502
+
+--- response_body
+status: 502
+body: 
+--- error_log
+upstream timed out
+
+
+
+=== TEST 48: subrequests truncated in its response body due to premature connection close (buffered, no content-length)
+--- config
+    server_tokens off;
+    location /proxy {
+        internal;
+
+        #proxy_read_timeout 100ms;
+        proxy_buffering on;
+        proxy_pass http://127.0.0.1:19113;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/proxy")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19113
+--- tcp_query_len: 65
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\n\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+upstream fin req: error=0 eof=1 rc=0
+post subreq: rc=0, status=200
+
+--- response_body
+status: 200
+body: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 49: subrequests truncated in its response body due to read timeout (buffered, no content-length)
+--- config
+    location /proxy {
+        internal;
+
+        proxy_read_timeout 100ms;
+        proxy_buffering on;
+        proxy_pass http://127.0.0.1:19113;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/proxy")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19113
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\n\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+conn err: 110: upstream timed out
+upstream fin req: error=0 eof=0 rc=502
+post subreq: rc=0, status=502
+
+--- response_body
+status: 502
+body: 
+--- error_log
+upstream timed out
+
+
+
+=== TEST 50: subrequests truncated in its response body due to premature connection close (nonbuffered, no content-length)
+--- config
+    server_tokens off;
+
+    location /proxy {
+        internal;
+
+        #proxy_read_timeout 100ms;
+        proxy_buffering off;
+        proxy_pass http://127.0.0.1:19113;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/proxy")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19113
+--- tcp_query_len: 65
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\n\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+upstream fin req: error=0 eof=1 rc=0
+post subreq: rc=0, status=200
+
+--- response_body
+status: 200
+body: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 51: subrequests truncated in its response body due to read timeout (nonbuffered, no content-length)
+--- config
+    location /proxy {
+        internal;
+
+        proxy_read_timeout 500ms;
+        proxy_buffering off;
+        proxy_pass http://127.0.0.1:19113;
+    }
+
+    location /main {
+        content_by_lua '
+            res = ngx.location.capture("/proxy")
+            ngx.say("status: ", res.status)
+            ngx.say("body: ", res.body)
+        ';
+    }
+--- request
+GET /main
+--- tcp_listen: 19113
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\n\r\nhello world"
+
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    #print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+*/
+--- stap_out
+conn err: 110: upstream timed out
+upstream fin req: error=0 eof=0 rc=504
+post subreq: rc=0, status=504
+
+--- response_body
+status: 504
+body: hello world
+--- error_log
+upstream timed out
+
diff --git a/debian/modules/nginx-lua/t/022-redirect.t b/debian/modules/nginx-lua/t/022-redirect.t
index 44478c7..261108e 100644
--- a/debian/modules/nginx-lua/t/022-redirect.t
+++ b/debian/modules/nginx-lua/t/022-redirect.t
@@ -15,9 +15,6 @@ plan tests => repeat_each() * (blocks() * 3 + 1);
 #no_diff();
 #no_long_string();
 
-$ENV{TEST_NGINX_PORT} ||= 1984;
-$ENV{TEST_NGINX_CLIENT_PORT} ||= 1984;
-
 run_tests();
 
 __DATA__
@@ -26,14 +23,14 @@ __DATA__
 --- config
     location /read {
         content_by_lua '
-            ngx.redirect("http://www.taobao.com/foo");
+            ngx.redirect("http://google.com/foo");
             ngx.say("hi")
         ';
     }
 --- request
 GET /read
 --- response_headers
-Location: http://www.taobao.com/foo
+Location: http://google.com/foo
 --- response_body_like: 302 Found
 --- error_code: 302
 
@@ -43,14 +40,14 @@ Location: http://www.taobao.com/foo
 --- config
     location /read {
         content_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", ngx.HTTP_MOVED_TEMPORARILY);
+            ngx.redirect("http://google.com/foo", ngx.HTTP_MOVED_TEMPORARILY);
             ngx.say("hi")
         ';
     }
 --- request
 GET /read
 --- response_headers
-Location: http://www.taobao.com/foo
+Location: http://google.com/foo
 --- response_body_like: 302 Found
 --- error_code: 302
 
@@ -60,14 +57,14 @@ Location: http://www.taobao.com/foo
 --- config
     location /read {
         content_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", ngx.HTTP_MOVED_PERMANENTLY);
+            ngx.redirect("http://google.com/foo", ngx.HTTP_MOVED_PERMANENTLY);
             ngx.say("hi")
         ';
     }
 --- request
 GET /read
 --- response_headers
-Location: http://www.taobao.com/foo
+Location: http://google.com/foo
 --- response_body_like: 301 Moved Permanently
 --- error_code: 301
 
@@ -77,7 +74,7 @@ Location: http://www.taobao.com/foo
 --- config
     location /read {
         content_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", 404);
+            ngx.redirect("http://google.com/foo", 404);
             ngx.say("hi")
         ';
     }
@@ -113,7 +110,7 @@ GET /read
         echo hello, world;
     }
     location /proxy {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT/echo;
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/echo;
     }
     location /read {
         content_by_lua '
@@ -134,14 +131,14 @@ GET /read
 --- config
     location /read {
         content_by_lua '
-            ngx.redirect("http://www.taobao.com/foo?bar=3");
+            ngx.redirect("http://google.com/foo?bar=3");
             ngx.say("hi")
         ';
     }
 --- request
 GET /read
 --- response_headers
-Location: http://www.taobao.com/foo?bar=3
+Location: http://google.com/foo?bar=3
 --- response_body_like: 302 Found
 --- error_code: 302
 
@@ -153,7 +150,7 @@ Location: http://www.taobao.com/foo?bar=3
         echo hello, world;
     }
     location /proxy {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT/echo;
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/echo;
     }
     location /read {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/023-rewrite/client-abort.t b/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
new file mode 100644
index 0000000..87f916c
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
@@ -0,0 +1,850 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = <<_EOC_;
+$t::StapThread::GCScript
+
+F(ngx_http_lua_check_broken_connection) {
+    println("lua check broken conn")
+}
+
+F(ngx_http_lua_request_cleanup) {
+    println("lua req cleanup")
+}
+_EOC_
+
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 - 1);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 0.1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 2: sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 3: sleep + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        rewrite_by_lua '
+            ngx.sleep(1)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: subrequest + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location /sub {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 5: subrequest + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        rewrite_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location /sub {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: fail
+lua req cleanup
+delete thread 1
+
+--- wait: 1.1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- error_log
+bad things happen
+
+
+
+=== TEST 6: subrequest + stop (proxy, ignore client abort)
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location = /sub {
+        proxy_ignore_client_abort on;
+        proxy_pass http://www.google.com:1234/;
+    }
+
+    location = /sleep {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 7: subrequest + stop (proxy, check client abort)
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location = /sub {
+        proxy_ignore_client_abort off;
+        proxy_pass http://www.google.com:1234/;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 8: need body on + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        lua_need_request_body on;
+        rewrite_by_lua '
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 9: ngx.req.read_body + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.req.read_body()
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 10: ngx.req.socket + receive() + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive()
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 11: ngx.req.socket + receive(N) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(5)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 12: ngx.req.socket + receive(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(2)
+            ngx.sleep(1)
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:lua check broken conn
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup|lua check broken conn
+lua req cleanup
+delete thread 1)$
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: ngx.req.socket + m * receive(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(2)
+            sock:receive(2)
+            sock:receive(1)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 14: ngx.req.socket + receiveuntil + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            local it = sock:receiveuntil("\\n")
+            it()
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 15: ngx.req.socket + receiveuntil + it(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            local it = sock:receiveuntil("\\n")
+            it(2)
+            it(3)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 16: cosocket + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.req.discard_body()
+
+            local sock, err = ngx.socket.tcp()
+            if not sock then
+                ngx.log(ngx.ERR, "failed to get socket: ", err)
+                return
+            end
+
+            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect: ", err)
+                return
+            end
+
+            local bytes, err = sock:send("blpop nonexist 2\\r\\n")
+            if not bytes then
+                ngx.log(ngx.ERR, "failed to send query: ", err)
+                return
+            end
+
+            -- ngx.log(ngx.ERR, "about to receive")
+
+            local res, err = sock:receive()
+            if not res then
+                ngx.log(ngx.ERR, "failed to receive query: ", err)
+                return
+            end
+
+            ngx.log(ngx.ERR, "res: ", res)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 17: ngx.req.socket + receive n < content-length + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            error("bad")
+        ';
+        content_by_lua return;
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 100\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+failed to receive: client aborted
+
+
+
+=== TEST 18: ngx.req.socket + receive n == content-length + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            ngx.sleep(1)
+            error("bad")
+        ';
+        content_by_lua return;
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 19: ngx.req.socket + receive n == content-length + ignore
+--- config
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            ngx.say("done")
+        ';
+        content_by_lua return;
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- shutdown: 1
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 20: ngx.req.read_body + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.req.read_body()
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- shutdown: 1
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: exec to lua + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.exec("/t2")
+        ';
+    }
+
+    location = /t2 {
+        lua_check_client_abort off;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 22: exec to proxy + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.exec("/t2")
+        ';
+    }
+
+    location = /t2 {
+        proxy_ignore_client_abort on;
+        proxy_pass http://127.0.0.1:$server_port/sleep;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 23: exec (named location) to proxy + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            ngx.exec("@t2")
+        ';
+    }
+
+    location @t2 {
+        proxy_ignore_client_abort on;
+        proxy_pass http://127.0.0.1:$server_port/sleep;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exit.t b/debian/modules/nginx-lua/t/023-rewrite/exit.t
index a91faf8..4664b71 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/exit.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/exit.t
@@ -13,17 +13,18 @@ repeat_each(2);
 #log_level('warn');
 #worker_connections(1024);
 
-plan tests => repeat_each() * (blocks() * 2);
+plan tests => repeat_each() * (blocks() * 2 + 3);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
-$ENV{LUA_CPATH} ||=
+our $LuaCpath = $ENV{LUA_CPATH} ||
     '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
 no_long_string();
+#no_shuffle();
 
 run_tests();
 
@@ -64,10 +65,9 @@ GET /lua
 --- request
 GET /lua
 --- error_log
-attempt to call ngx.exit after sending out the headers
---- no_error_log
-[alert]
---- ignore_response
+attempt to set status 404 via ngx.exit after sending out the response status 200
+--- response_body
+hi
 
 
 
@@ -121,13 +121,15 @@ GET /api?user=agentz
 
 
 === TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
-
+"
 --- config
     location /memc {
         internal;
@@ -190,13 +192,15 @@ Logged in 56
 
 
 === TEST 7: working with ngx_auth_request (simplest form)
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
-
+"
 --- config
     location /memc {
         internal;
@@ -259,23 +263,25 @@ Logged in 56
 
 
 === TEST 8: working with ngx_auth_request
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
 
     upstream memc_a {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
     }
 
     upstream memc_b {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
     }
 
     upstream_list memc_cluster memc_a memc_b;
-
+"
 --- config
     location /memc {
         internal;
@@ -335,6 +341,8 @@ ngx.var.uid = res[1].uid;
 GET /api?uid=32
 --- response_body
 Logged in 56
+--- no_error_log
+[error]
 
 
 
@@ -533,3 +541,26 @@ morning
 This is our own content
 --- error_code: 410
 
+
+
+=== TEST 17: encode args table with a multi-value arg.
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.exit(204)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/blah;
+    }
+
+    location = /blah {
+        echo blah;
+    }
+--- request
+GET /t
+--- more_headers2
+--- response_body
+--- error_code: 204
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/on-abort.t b/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
new file mode 100644
index 0000000..cf0c760
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
@@ -0,0 +1,663 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = <<_EOC_;
+$t::StapThread::GCScript
+
+F(ngx_http_lua_check_broken_connection) {
+    println("lua check broken conn")
+}
+
+F(ngx_http_lua_request_cleanup) {
+    println("lua req cleanup")
+}
+_EOC_
+
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 15);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ignore the client abort event in the user callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 2: abort in the user callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 3: ngx.exit(499) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 4: ngx.exit(408) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(408)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.1
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 5: ngx.exit(-1) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(-1)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 6: ngx.exit(0) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(0)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+            ngx.log(ngx.ERR, "main handler done")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.7;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: fail
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.6
+--- ignore_response
+--- error_log
+client prematurely closed connection
+on abort called
+lua user thread aborted: runtime error: [string "rewrite_by_lua"]:4: attempt to abort with pending subrequests
+main handler done
+
+
+
+=== TEST 7: accessing cosocket in callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+                if not ok then
+                    ngx.log(ngx.ERR, "failed to connect to redis: ", err)
+                    ngx.exit(499)
+                end
+                local bytes, err = sock:send("flushall\\r\\n")
+                if not bytes then
+                    ngx.log(ngx.ERR, "failed to send query: ", err)
+                    ngx.exit(499)
+                end
+
+                local res, err = sock:receive()
+                if not res then
+                    ngx.log(ngx.ERR, "failed to receive: ", err)
+                    ngx.exit(499)
+                end
+                ngx.log(ngx.NOTICE, "callback done: ", res)
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.2
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+callback done: +OK
+
+
+
+=== TEST 8: ignore the client abort event in the user callback (no check)
+--- config
+    location /t {
+        lua_check_client_abort off;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("cannot set on_abort: ", err)
+                return
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- response_body
+cannot set on_abort: lua_check_client_abort is off
+--- no_error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 9: regsiter on_abort callback but no client abortion
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.say("done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: ok
+delete thread 1
+delete thread 2
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- response_body
+done
+--- no_error_log
+[error]
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 10: ignore the client abort event in the user callback (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.7)
+                ngx.log(ngx.NOTICE, "main handler done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+lua check broken conn
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 11: abort in the user callback (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.7)
+                ngx.log(ngx.NOTICE, "main handler done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 3
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 12: regsiter on_abort callback but no client abortion (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.1)
+                ngx.say("done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+delete thread 2
+terminate 4: ok
+delete thread 4
+lua req cleanup
+
+--- response_body
+done
+--- no_error_log
+[error]
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 13: regsiter on_abort callback multiple times
+--- config
+    location /t {
+        lua_check_client_abort on;
+        rewrite_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("1: cannot set on_abort: " .. err)
+                return
+            end
+
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("2: cannot set on_abort: " .. err)
+                return
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.1)
+                ngx.say("done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: ok
+delete thread 1
+delete thread 2
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- response_body
+2: cannot set on_abort: duplicate call
+
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/redirect.t b/debian/modules/nginx-lua/t/023-rewrite/redirect.t
index 687cb36..948a5d5 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/redirect.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/redirect.t
@@ -15,8 +15,6 @@ plan tests => blocks() * repeat_each() * 3;
 #no_diff();
 #no_long_string();
 
-$ENV{TEST_NGINX_PORT} ||= 1984;
-
 run_tests();
 
 __DATA__
diff --git a/debian/modules/nginx-lua/t/023-rewrite/req-body.t b/debian/modules/nginx-lua/t/023-rewrite/req-body.t
index 647b699..abb9a2a 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/req-body.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/req-body.t
@@ -50,7 +50,7 @@ hello, world
 Host: localhost\r
 Content-Length: 100\r
 Connection: close\r
-
+\r
 hello, world"
 --- response_body:
 --- error_code_like: ^(?:500)?$
diff --git a/debian/modules/nginx-lua/t/023-rewrite/req-socket.t b/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
new file mode 100644
index 0000000..f5695f0
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
@@ -0,0 +1,536 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 3);
+
+our $HtmlDir = html_dir;
+
+#$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_long_string();
+#no_diff();
+#log_level 'warn';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /t {
+        rewrite_by_lua '
+            local sock, err = ngx.req.socket()
+            if sock then
+                ngx.say("got the request socket")
+            else
+                ngx.say("failed to get the request socket: ", err)
+            end
+
+            for i = 1, 3 do
+                local data, err, part = sock:receive(5)
+                if data then
+                    ngx.say("received: ", data)
+                else
+                    ngx.say("failed to receive: ", err, " [", part, "]")
+                end
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+POST /t
+hello world
+--- response_body
+got the request socket
+received: hello
+received:  worl
+failed to receive: closed [d]
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: multipart rfc sample (just partial streaming)
+--- config
+    location /t {
+        rewrite_by_lua '
+            local sock, err = ngx.req.socket()
+            if sock then
+                ngx.say("got the request socket")
+            else
+                ngx.say("failed to get the request socket: ", err)
+            end
+
+            local boundary
+            local header = ngx.var.http_content_type
+            local m = ngx.re.match(header, [[; +boundary=(?:"(.*?)"|(\\w+))]], "jo")
+            if m then
+                boundary = m[1] or m[2]
+
+            else
+                ngx.say("invalid content-type header")
+                return
+            end
+
+            local read_to_boundary = sock:receiveuntil("\\r\\n--" .. boundary)
+            local read_line = sock:receiveuntil("\\r\\n")
+
+            local data, err, part = read_to_boundary()
+            if data then
+                ngx.say("preamble: [" .. data .. "]")
+            else
+                ngx.say("failed to read the first boundary: ", err)
+                return
+            end
+
+            local i = 1
+            while true do
+                local line, err = read_line()
+
+                if not line then
+                    ngx.say("failed to read post-boundary line: ", err)
+                    return
+                end
+
+                m = ngx.re.match(line, "--$", "jo")
+                if m then
+                    ngx.say("found the end of the stream")
+                    return
+                end
+
+                while true do
+                    local line, err = read_line()
+                    if not line then
+                        ngx.say("failed to read part ", i, " header: ", err)
+                        return
+                    end
+
+                    if line == "" then
+                        -- the header part completes
+                        break
+                    end
+
+                    ngx.say("part ", i, " header: [", line, "]")
+                end
+
+                local data, err, part = read_to_boundary()
+                if data then
+                    ngx.say("part ", i, " body: [" .. data .. "]")
+                else
+                    ngx.say("failed to read part ", i + 1, " boundary: ", err)
+                    return
+                end
+
+                i = i + 1
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request eval
+"POST /t
+This is the preamble.  It is to be ignored, though it
+is a handy place for mail composers to include an
+explanatory note to non-MIME compliant readers.\r
+--simple boundary\r
+\r
+This is implicitly typed plain ASCII text.
+It does NOT end with a linebreak.\r
+--simple boundary\r
+Content-type: text/plain; charset=us-ascii\r
+\r
+This is explicitly typed plain ASCII text.
+It DOES end with a linebreak.
+\r
+--simple boundary--\r
+This is the epilogue.  It is also to be ignored.
+"
+--- more_headers
+Content-Type: multipart/mixed; boundary="simple boundary"
+--- response_body
+got the request socket
+preamble: [This is the preamble.  It is to be ignored, though it
+is a handy place for mail composers to include an
+explanatory note to non-MIME compliant readers.]
+part 1 body: [This is implicitly typed plain ASCII text.
+It does NOT end with a linebreak.]
+part 2 header: [Content-type: text/plain; charset=us-ascii]
+part 2 body: [This is explicitly typed plain ASCII text.
+It DOES end with a linebreak.
+]
+found the end of the stream
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: multipart rfc sample (completely streaming)
+--- config
+    location /t {
+        rewrite_by_lua '
+            local sock, err = ngx.req.socket()
+            if sock then
+                ngx.say("got the request socket")
+            else
+                ngx.say("failed to get the request socket: ", err)
+            end
+
+            local boundary
+            local header = ngx.var.http_content_type
+            local m = ngx.re.match(header, [[; +boundary=(?:"(.*?)"|(\\w+))]], "jo")
+            if m then
+                boundary = m[1] or m[2]
+
+            else
+                ngx.say("invalid content-type header")
+                return
+            end
+
+            local read_to_boundary = sock:receiveuntil("\\r\\n--" .. boundary)
+            local read_line = sock:receiveuntil("\\r\\n")
+
+            local preamble = ""
+            while true do
+                local data, err, part = read_to_boundary(1)
+                if data then
+                    preamble = preamble .. data
+
+                elseif not err then
+                    break
+
+                else
+                    ngx.say("failed to read the first boundary: ", err)
+                    return
+                end
+            end
+
+            ngx.say("preamble: [" .. preamble .. "]")
+
+            local i = 1
+            while true do
+                local line, err = read_line(50)
+
+                if not line and err then
+                    ngx.say("1: failed to read post-boundary line: ", err)
+                    return
+                end
+
+                if line then
+                    local dummy
+                    dummy, err = read_line(1)
+                    if err then
+                        ngx.say("2: failed to read post-boundary line: ", err)
+                        return
+                    end
+
+                    if dummy then
+                        ngx.say("bad post-boundary line: ", dummy)
+                        return
+                    end
+
+                    m = ngx.re.match(line, "--$", "jo")
+                    if m then
+                        ngx.say("found the end of the stream")
+                        return
+                    end
+                end
+
+                while true do
+                    local line, err = read_line(50)
+                    if not line and err then
+                        ngx.say("failed to read part ", i, " header: ", err)
+                        return
+                    end
+
+                    if line then
+                        local line, err = read_line(1)
+                        if line or err then
+                            ngx.say("error")
+                            return
+                        end
+                    end
+
+                    if line == "" then
+                        -- the header part completes
+                        break
+                    end
+
+                    ngx.say("part ", i, " header: [", line, "]")
+                end
+
+                local body = ""
+
+                while true do
+                    local data, err, part = read_to_boundary(1)
+                    if data then
+                        body = body .. data
+
+                    elseif err then
+                        ngx.say("failed to read part ", i + 1, " boundary: ", err)
+                        return
+
+                    else
+                        break
+                    end
+                end
+
+                ngx.say("part ", i, " body: [" .. body .. "]")
+
+                i = i + 1
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request eval
+"POST /t
+This is the preamble.  It is to be ignored, though it
+is a handy place for mail composers to include an
+explanatory note to non-MIME compliant readers.\r
+--simple boundary\r
+\r
+This is implicitly typed plain ASCII text.
+It does NOT end with a linebreak.\r
+--simple boundary\r
+Content-type: text/plain; charset=us-ascii\r
+\r
+This is explicitly typed plain ASCII text.
+It DOES end with a linebreak.
+\r
+--simple boundary--\r
+This is the epilogue.  It is also to be ignored.
+"
+--- more_headers
+Content-Type: multipart/mixed; boundary="simple boundary"
+--- response_body
+got the request socket
+preamble: [This is the preamble.  It is to be ignored, though it
+is a handy place for mail composers to include an
+explanatory note to non-MIME compliant readers.]
+part 1 body: [This is implicitly typed plain ASCII text.
+It does NOT end with a linebreak.]
+part 2 header: [Content-type: text/plain; charset=us-ascii]
+part 2 body: [This is explicitly typed plain ASCII text.
+It DOES end with a linebreak.
+]
+found the end of the stream
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: attempt to use the req socket across request boundary
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        rewrite_by_lua '
+            local test = require "test"
+            test.go()
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+local sock, err
+
+function go()
+    if not sock then
+        sock, err = ngx.req.socket()
+        if sock then
+            ngx.say("got the request socket")
+        else
+            ngx.say("failed to get the request socket: ", err)
+        end
+    else
+        for i = 1, 3 do
+            local data, err, part = sock:receive(5)
+            if data then
+                ngx.say("received: ", data)
+            else
+                ngx.say("failed to receive: ", err, " [", part, "]")
+            end
+        end
+    end
+end
+--- request
+POST /t
+hello world
+--- response_body_like
+(?:got the request socket
+|failed to receive: closed [d]
+)?done
+--- no_error_log
+[alert]
+
+
+
+=== TEST 5: receive until on request_body - receiveuntil(1) on the last byte of the body
+See https://groups.google.com/group/openresty/browse_thread/thread/43cf01da3c681aba for details
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        rewrite_by_lua '
+            local test = require "test"
+            test.go()
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go()
+   local sock, err = ngx.req.socket()
+   if sock then
+      ngx.say("got the request socket")
+   else
+      ngx.say("failed to get the request socket: ", err)
+      return
+   end
+
+   local data, err, part = sock:receive(56)
+   if data then
+      ngx.say("received: ", data)
+   else
+      ngx.say("failed to receive: ", err, " [", part, "]")
+   end
+
+   local discard_line = sock:receiveuntil('\r\n')
+
+   local data, err, part = discard_line(8192)
+   if data then
+      ngx.say("received len: ", #data)
+   else
+      ngx.say("failed to receive: ", err, " [", part, "]")
+   end
+
+   local data, err, part = discard_line(1)
+   if data then
+      ngx.say("received: ", data)
+   else
+      ngx.say("failed to receive: ", err, " [", part, "]")
+   end
+end
+--- request
+POST /t
+-----------------------------820127721219505131303151179################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################$
+--- response_body
+got the request socket
+received: -----------------------------820127721219505131303151179
+received len: 8192
+received: $
+done
+--- no_error_log
+[error]
+--- timeout: 10
+
+
+
+=== TEST 6: pipelined POST requests
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        rewrite_by_lua '
+            local test = require "test"
+            test.go()
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go()
+   local sock, err = ngx.req.socket()
+   if sock then
+      ngx.say("got the request socket")
+   else
+      ngx.say("failed to get the request socket: ", err)
+      return
+   end
+
+   while true do
+       local data, err, part = sock:receive(4)
+       if data then
+          ngx.say("received: ", data)
+       else
+          ngx.say("failed to receive: ", err, " [", part, "]")
+          return
+       end
+   end
+end
+--- pipelined_requests eval
+["POST /t
+hello, world",
+"POST /t
+hiya, world"]
+--- response_body eval
+["got the request socket
+received: hell
+received: o, w
+received: orld
+failed to receive: closed []
+done
+",
+"got the request socket
+received: hiya
+received: , wo
+failed to receive: closed [rld]
+done
+"]
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: Expect & 100 Continue
+--- config
+    location /t {
+        rewrite_by_lua '
+            local sock, err = ngx.req.socket()
+            if sock then
+                ngx.say("got the request socket")
+            else
+                ngx.say("failed to get the request socket: ", err)
+                return
+            end
+
+            for i = 1, 3 do
+                local data, err, part = sock:receive(5)
+                if data then
+                    ngx.say("received: ", data)
+                else
+                    ngx.say("failed to receive: ", err, " [", part, "]")
+                end
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+POST /t
+hello world
+--- more_headers
+Expect: 100-Continue
+--- error_code: 100
+--- response_body_like chomp
+\breceived: hello\b.*?\breceived:  worl\b
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sleep.t b/debian/modules/nginx-lua/t/023-rewrite/sleep.t
new file mode 100644
index 0000000..d178c8a
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/sleep.t
@@ -0,0 +1,223 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * 33;
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sleep 0.5
+--- config
+    location /test {
+        rewrite_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.sleep(0.5)
+            local now = ngx.now()
+            ngx.say(now - before)
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:4[5-9]\d*|5[0-9]\d*|5)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+
+
+
+=== TEST 2: sleep ag
+--- config
+    location /test {
+        rewrite_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.sleep("a")
+            local now = ngx.now()
+            ngx.say(now - before)
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /test
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+--- error_log
+bad argument #1 to 'sleep'
+
+
+
+=== TEST 3: sleep 0.5 in subrequest
+--- config
+    location /test {
+        rewrite_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.location.capture("/sleep")
+            local now = ngx.now()
+            local delay = now - before
+            ngx.say(delay)
+            ngx.exit(200)
+        ';
+    }
+    location /sleep {
+        rewrite_by_lua 'ngx.sleep(0.5) ngx.exit(200)';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:4[5-9]\d*|5[0-9]\d*|5)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/sleep?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: sleep a in subrequest with bad argument
+--- config
+    location /test {
+        rewrite_by_lua '
+            local res = ngx.location.capture("/sleep");
+            ngx.say(res.status)
+            ngx.exit(200)
+        ';
+    }
+    location /sleep {
+        rewrite_by_lua 'ngx.sleep("a") ngx.exit(200)';
+    }
+--- request
+GET /test
+--- response_body
+500
+--- error_log
+bad argument #1 to 'sleep'
+
+
+
+=== TEST 5: sleep 0.5 - multi-times
+--- config
+    location /test {
+        rewrite_by_lua '
+            ngx.update_time()
+            local start = ngx.now()
+            ngx.sleep(0.3)
+            ngx.sleep(0.3)
+            ngx.sleep(0.3)
+            ngx.say(ngx.now() - start)
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:8[5-9]\d*|9[0-9]\d*|9)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: sleep 0.5 - interleaved by ngx.say() - ended by ngx.sleep
+--- config
+    location /test {
+        rewrite_by_lua '
+            ngx.send_headers()
+            -- ngx.location.capture("/sleep")
+            ngx.sleep(1)
+            ngx.say("blah")
+            ngx.sleep(1)
+            -- ngx.location.capture("/sleep")
+            ngx.exit(200)
+        ';
+    }
+    location = /sleep {
+        echo_sleep 0.1;
+    }
+--- request
+GET /test
+--- response_body
+blah
+--- error_log
+lua ready to sleep
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: sleep 0.5 - interleaved by ngx.say() - not ended by ngx.sleep
+--- config
+    location /test {
+        rewrite_by_lua '
+            ngx.send_headers()
+            -- ngx.location.capture("/sleep")
+            ngx.sleep(0.3)
+            ngx.say("blah")
+            ngx.sleep(0.5)
+            -- ngx.location.capture("/sleep")
+            ngx.say("hiya")
+            ngx.exit(200)
+        ';
+    }
+    location = /sleep {
+        echo_sleep 0.1;
+    }
+--- request
+GET /test
+--- response_body
+blah
+hiya
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: ngx.location.capture before and after ngx.sleep
+--- config
+    location /test {
+        rewrite_by_lua '
+            local res = ngx.location.capture("/sub")
+            ngx.print(res.body)
+
+            ngx.sleep(0.1)
+
+            res = ngx.location.capture("/sub")
+            ngx.print(res.body)
+            ngx.exit(200)
+        ';
+    }
+    location = /hello {
+        echo hello world;
+    }
+    location = /sub {
+        proxy_pass http://127.0.0.1:$server_port/hello;
+    }
+--- request
+GET /test
+--- response_body
+hello world
+hello world
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
new file mode 100644
index 0000000..a0f3d95
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
@@ -0,0 +1,986 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 5 + 8);
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
+#$ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
+
+$ENV{LUA_PATH} ||=
+    '/usr/local/openresty-debug/lualib/?.lua;/usr/local/openresty/lualib/?.lua;;';
+
+no_long_string();
+#no_diff();
+#log_level 'warn';
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        rewrite_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go(port)
+            test.go(port)
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port)
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body_like
+^connected: 1, reused: \d+
+request sent: 11
+received: OK
+connected: 1, reused: [1-9]\d*
+request sent: 11
+received: OK
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for "]
+--- error_log eval
+qq{lua tcp socket get keepalive peer: using connection
+lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
+}
+
+
+
+=== TEST 2: free up the whole connection pool if no active connections
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        rewrite_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go(port, true)
+            test.go(port, false)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, keepalive)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port)
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+
+    if keepalive then
+        local ok, err = sock:setkeepalive()
+        if not ok then
+            ngx.say("failed to set reusable: ", err)
+        end
+
+    else
+        sock:close()
+    end
+end
+--- response_body_like
+^connected: 1, reused: \d+
+request sent: 11
+received: OK
+connected: 1, reused: [1-9]\d*
+request sent: 11
+received: OK
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket get keepalive peer: using connection",
+"lua tcp socket keepalive: free connection pool for "]
+
+
+
+=== TEST 3: upstream sockets close prematurely
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+   server_tokens off;
+   keepalive_timeout 100ms;
+   location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, err = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for "]
+--- timeout: 3
+
+
+
+=== TEST 4: http keepalive
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+   server_tokens off;
+   location /t {
+        keepalive_timeout 60s;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, err = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive close handler: fd:",
+"lua tcp socket keepalive: free connection pool for "]
+--- timeout: 4
+
+
+
+=== TEST 5: lua_socket_keepalive_timeout
+--- config
+   server_tokens off;
+   location /t {
+       keepalive_timeout 60s;
+       lua_socket_keepalive_timeout 100ms;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, res = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 100 ms",
+qr/lua tcp socket connection pool size: 30\b/]
+--- timeout: 4
+
+
+
+=== TEST 6: lua_socket_pool_size
+--- config
+   server_tokens off;
+   location /t {
+       keepalive_timeout 60s;
+       lua_socket_keepalive_timeout 100ms;
+       lua_socket_pool_size 1;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, res = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 100 ms",
+qr/lua tcp socket connection pool size: 1\b/]
+--- timeout: 4
+
+
+
+=== TEST 7: "lua_socket_keepalive_timeout 0" means unlimited
+--- config
+   server_tokens off;
+   location /t {
+       keepalive_timeout 60s;
+       lua_socket_keepalive_timeout 0;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, res = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive timeout: unlimited",
+qr/lua tcp socket connection pool size: 30\b/]
+--- timeout: 4
+
+
+
+=== TEST 8: setkeepalive(timeout) overrides lua_socket_keepalive_timeout
+--- config
+   server_tokens off;
+   location /t {
+        keepalive_timeout 60s;
+        lua_socket_keepalive_timeout 60s;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, res = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive(123)
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 123 ms",
+qr/lua tcp socket connection pool size: 30\b/]
+--- timeout: 4
+
+
+
+=== TEST 9: sock:setkeepalive(timeout, size) overrides lua_socket_pool_size
+--- config
+   server_tokens off;
+   location /t {
+       keepalive_timeout 60s;
+       lua_socket_keepalive_timeout 100ms;
+       lua_socket_pool_size 100;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, res = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive(101, 25)
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 101 ms",
+qr/lua tcp socket connection pool size: 25\b/]
+--- timeout: 4
+
+
+
+=== TEST 10: sock:keepalive_timeout(0) means unlimited
+--- config
+   server_tokens off;
+   location /t {
+       keepalive_timeout 60s;
+       lua_socket_keepalive_timeout 1000ms;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        rewrite_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: keepalive\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local reader = sock:receiveuntil("\\r\\n0\\r\\n\\r\\n")
+            local data, res = reader()
+
+            if not data then
+                ngx.say("failed to receive response body: ", err)
+                return
+            end
+
+            ngx.say("received response of ", #data, " bytes")
+
+            local ok, err = sock:setkeepalive(0)
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 61
+received response of 156 bytes
+done
+--- no_error_log
+[error]
+--- error_log eval
+["lua tcp socket keepalive timeout: unlimited",
+qr/lua tcp socket connection pool size: 30\b/]
+--- timeout: 4
+
+
+
+=== TEST 11: sanity (uds)
+--- http_config eval
+"
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    server {
+        listen unix:$::HtmlDir/nginx.sock;
+        default_type 'text/plain';
+
+        server_tokens off;
+        location /foo {
+            echo foo;
+            more_clear_headers Date;
+        }
+    }
+"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        rewrite_by_lua '
+            local test = require "test"
+            local path = "$TEST_NGINX_HTML_DIR/nginx.sock";
+            local port = ngx.var.port
+            test.go(path, port)
+            test.go(path, port)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(path, port)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("unix:" .. path)
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local req = "GET /foo HTTP/1.1\r\nHost: localhost\r\nConnection: keepalive\r\n\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local reader = sock:receiveuntil("\r\n0\r\n\r\n")
+    local data, err = reader()
+
+    if not data then
+        ngx.say("failed to receive response body: ", err)
+        return
+    end
+
+    ngx.say("received response of ", #data, " bytes")
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- response_body_like
+^connected: 1, reused: \d+
+request sent: 61
+received response of 119 bytes
+connected: 1, reused: [1-9]\d*
+request sent: 61
+received response of 119 bytes
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for "]
+--- error_log eval
+["lua tcp socket get keepalive peer: using connection",
+'lua tcp socket keepalive create connection pool for key "unix:']
+
+
+
+=== TEST 12: github issue #108: ngx.locaiton.capture + redis.set_keepalive
+--- http_config eval
+    qq{
+        lua_package_path "$::HtmlDir/?.lua;;";
+    }
+--- config
+    location /t {
+        default_type text/html;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        #lua_code_cache off;
+        lua_need_request_body on;
+        rewrite_by_lua_file html/t.lua;
+        content_by_lua return;
+    }
+
+    location /anyurl {
+        internal;
+        proxy_pass http://127.0.0.1:$server_port/dummy;
+    }
+
+    location = /dummy {
+        echo dummy;
+    }
+--- user_files
+>>> t.lua
+local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+if not sock then ngx.say(err) return end
+sock:send("flush_all\r\n")
+sock:receive()
+sock:setkeepalive()
+
+sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+if not sock then ngx.say(err) return end
+local res = ngx.location.capture("/anyurl") --3
+
+ngx.say("ok")
+--- request
+    GET /t
+--- response_body
+ok
+--- error_log
+lua tcp socket get keepalive peer: using connection
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 13: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    error_page 404 /404.html;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        access_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go(port)
+            ngx.exit(404)
+        ';
+        echo hello;
+    }
+--- user_files
+>>> 404.html
+Not found, dear...
+>>> test.lua
+module("test", package.seeall)
+
+function go(port)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port)
+    if not ok then
+        ngx.log(ngx.ERR, "failed to connect: ", err)
+        return
+    end
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.log(ngx.ERR, "failed to send request: ", err)
+        return
+    end
+
+    local line, err, part = sock:receive()
+    if not line then
+        ngx.log(ngx.ERR, "failed to receive a line: ", err, " [", part, "]")
+        return
+    end
+
+    -- local ok, err = sock:setkeepalive()
+    -- if not ok then
+        -- ngx.log(ngx.ERR, "failed to set reusable: ", err)
+        -- return
+    -- end
+end
+--- request
+GET /t
+--- response_body
+Not found, dear...
+--- error_code: 404
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
new file mode 100644
index 0000000..f1affcc
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -0,0 +1,611 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+BEGIN {
+    if (!defined $ENV{LD_PRELOAD}) {
+        $ENV{LD_PRELOAD} = '';
+    }
+
+    if ($ENV{LD_PRELOAD} !~ /\bmockeagain\.so\b/) {
+        $ENV{LD_PRELOAD} = "mockeagain.so $ENV{LD_PRELOAD}";
+    }
+
+    $ENV{MOCKEAGAIN} = 'w';
+
+    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
+    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
+}
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 14);
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+
+no_long_string();
+no_diff();
+run_tests();
+
+__DATA__
+
+=== TEST 1: lua_socket_connect_timeout only
+--- config
+    server_tokens off;
+    lua_socket_connect_timeout 100ms;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 1s;
+    location /t1 {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("www.google.com", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t1
+--- response_body
+failed to connect: timeout
+--- error_log
+lua tcp socket connect timeout: 100
+lua tcp socket connect timed out
+--- timeout: 5
+
+
+
+=== TEST 2: sock:settimeout() overrides lua_socket_connect_timeout
+--- config
+    server_tokens off;
+    lua_socket_connect_timeout 60s;
+    lua_socket_log_errors off;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 1s;
+    location /t2 {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            sock:settimeout(150)
+            local ok, err = sock:connect("www.google.com", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t2
+--- response_body
+failed to connect: timeout
+--- error_log
+lua tcp socket connect timeout: 150
+--- no_error_log
+[error]
+[alert]
+--- timeout: 5
+
+
+
+=== TEST 3: sock:settimeout(nil) does not override lua_socket_connect_timeout
+--- config
+    server_tokens off;
+    lua_socket_log_errors off;
+    lua_socket_connect_timeout 102ms;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 1s;
+    location /t3 {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            sock:settimeout(nil)
+            local ok, err = sock:connect("www.google.com", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t3
+--- response_body
+failed to connect: timeout
+--- error_log
+lua tcp socket connect timeout: 102
+--- no_error_log
+[error]
+[alert]
+--- timeout: 5
+
+
+
+=== TEST 4: sock:settimeout(0) does not override lua_socket_connect_timeout
+--- config
+    server_tokens off;
+    lua_socket_connect_timeout 102ms;
+    lua_socket_log_errors off;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 1s;
+    location /t4 {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            sock:settimeout(0)
+            local ok, err = sock:connect("www.google.com", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t4
+--- response_body
+failed to connect: timeout
+--- error_log
+lua tcp socket connect timeout: 102
+--- timeout: 5
+--- no_error_log
+[error]
+[alert]
+--- timeout: 5
+
+
+
+=== TEST 5: sock:settimeout(-1) does not override lua_socket_connect_timeout
+--- config
+    server_tokens off;
+    lua_socket_connect_timeout 102ms;
+    lua_socket_log_errors off;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 1s;
+    location /t5 {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            sock:settimeout(-1)
+            local ok, err = sock:connect("www.google.com", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t5
+--- response_body
+failed to connect: timeout
+--- error_log
+lua tcp socket connect timeout: 102
+--- no_error_log
+[error]
+[alert]
+--- timeout: 5
+
+
+
+=== TEST 6: lua_socket_read_timeout only
+--- config
+    server_tokens off;
+    lua_socket_read_timeout 100ms;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local line
+            line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to receive: timeout
+--- error_log
+lua tcp socket read timeout: 100
+lua tcp socket connect timeout: 60000
+lua tcp socket read timed out
+
+
+
+=== TEST 7: sock:settimeout() overrides lua_socket_read_timeout
+--- config
+    server_tokens off;
+    lua_socket_read_timeout 60s;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(150)
+
+            local line
+            line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to receive: timeout
+--- error_log
+lua tcp socket connect timeout: 60000
+lua tcp socket read timeout: 150
+lua tcp socket read timed out
+
+
+
+=== TEST 8: sock:settimeout(nil) does not override lua_socket_read_timeout
+--- config
+    server_tokens off;
+    lua_socket_read_timeout 102ms;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(nil)
+
+            local line
+            line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to receive: timeout
+--- error_log
+lua tcp socket connect timeout: 60000
+lua tcp socket read timeout: 102
+lua tcp socket read timed out
+
+
+
+=== TEST 9: sock:settimeout(0) does not override lua_socket_read_timeout
+--- config
+    server_tokens off;
+    lua_socket_read_timeout 102ms;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(0)
+
+            local line
+            line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive: ", err)
+            end
+
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to receive: timeout
+--- error_log
+lua tcp socket connect timeout: 60000
+lua tcp socket read timeout: 102
+lua tcp socket read timed out
+
+
+
+=== TEST 10: sock:settimeout(-1) does not override lua_socket_read_timeout
+--- config
+    server_tokens off;
+    lua_socket_read_timeout 102ms;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(-1)
+
+            local line
+            line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to receive: timeout
+--- error_log
+lua tcp socket read timeout: 102
+lua tcp socket connect timeout: 60000
+lua tcp socket read timed out
+
+
+
+=== TEST 11: lua_socket_send_timeout only
+--- config
+    server_tokens off;
+    lua_socket_send_timeout 100ms;
+    resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local bytes
+            bytes, err = sock:send("get helloworld!")
+            if bytes then
+                ngx.say("sent: ", bytes)
+            else
+                ngx.say("failed to send: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to send: timeout
+--- error_log
+lua tcp socket send timeout: 100
+lua tcp socket connect timeout: 60000
+lua tcp socket write timed out
+
+
+
+=== TEST 12: sock:settimeout() overrides lua_socket_send_timeout
+--- config
+    server_tokens off;
+    lua_socket_send_timeout 60s;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(150)
+
+            local bytes
+            bytes, err = sock:send("get helloworld!")
+            if bytes then
+                ngx.say("sent: ", bytes)
+            else
+                ngx.say("failed to send: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to send: timeout
+--- error_log
+lua tcp socket connect timeout: 60000
+lua tcp socket send timeout: 150
+lua tcp socket write timed out
+
+
+
+=== TEST 13: sock:settimeout(nil) does not override lua_socket_send_timeout
+--- config
+    server_tokens off;
+    lua_socket_send_timeout 102ms;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(nil)
+
+            local bytes
+            bytes, err = sock:send("get helloworld!")
+            if bytes then
+                ngx.say("sent: ", bytes)
+            else
+                ngx.say("failed to send: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to send: timeout
+--- error_log
+lua tcp socket connect timeout: 60000
+lua tcp socket send timeout: 102
+lua tcp socket write timed out
+
+
+
+=== TEST 14: sock:settimeout(0) does not override lua_socket_send_timeout
+--- config
+    server_tokens off;
+    lua_socket_send_timeout 102ms;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(0)
+
+            local bytes
+            bytes, err = sock:send("get helloworld!")
+            if bytes then
+                ngx.say("sent: ", bytes)
+            else
+                ngx.say("failed to send: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to send: timeout
+--- error_log
+lua tcp socket connect timeout: 60000
+lua tcp socket send timeout: 102
+lua tcp socket write timed out
+
+
+
+=== TEST 15: sock:settimeout(-1) does not override lua_socket_send_timeout
+--- config
+    server_tokens off;
+    lua_socket_send_timeout 102ms;
+    #resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            sock:settimeout(-1)
+
+            local bytes
+            bytes, err = sock:send("get helloworld!")
+            if bytes then
+                ngx.say("sent: ", bytes)
+            else
+                ngx.say("failed to send: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to send: timeout
+--- error_log
+lua tcp socket send timeout: 102
+lua tcp socket connect timeout: 60000
+lua tcp socket write timed out
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
new file mode 100644
index 0000000..747b462
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
@@ -0,0 +1,2038 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 87;
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+
+#log_level 'warn';
+
+#no_long_string();
+#no_diff();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+failed to receive a line: closed []
+close: nil closed
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: no trailing newline
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 1234;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            sock:close()
+            ngx.say("closed")
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.print("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 3
+received: Connection: close
+received: 
+failed to receive a line: closed [foo]
+closed
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: no resolver defined
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 1234;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("agentzh.org", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+failed to connect: no resolver defined to resolve "agentzh.org"
+connected: nil
+failed to send request: closed
+--- error_log
+attempt to send data on a closed socket:
+
+
+
+=== TEST 4: with resolver
+--- timeout: 10
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 5s;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = 80
+            local ok, err = sock:connect("agentzh.org", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET / HTTP/1.0\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local line, err = sock:receive()
+            if line then
+                ngx.say("first line received: ", line)
+
+            else
+                ngx.say("failed to receive the first line: ", err)
+            end
+
+            line, err = sock:receive()
+            if line then
+                ngx.say("second line received: ", line)
+
+            else
+                ngx.say("failed to receive the second line: ", err)
+            end
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 56
+first line received: HTTP/1.1 200 OK
+second line received: Server: ngx_openresty
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: connection refused (tcp)
+--- config
+    location /test {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("127.0.0.1", 16787)
+            ngx.say("connect: ", ok, " ", err)
+
+            local bytes
+            bytes, err = sock:send("hello")
+            ngx.say("send: ", bytes, " ", err)
+
+            local line
+            line, err = sock:receive()
+            ngx.say("receive: ", line, " ", err)
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+    GET /test
+--- response_body
+connect: nil connection refused
+send: nil closed
+receive: nil closed
+close: nil closed
+--- error_log eval
+qr/connect\(\) failed \(\d+: Connection refused\)/
+
+
+
+=== TEST 6: connection timeout (tcp)
+--- config
+    resolver $TEST_NGINX_RESOLVER;
+    lua_socket_connect_timeout 100ms;
+    lua_socket_send_timeout 100ms;
+    lua_socket_read_timeout 100ms;
+    resolver_timeout 2s;
+    location /test {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("taobao.com", 16787)
+            ngx.say("connect: ", ok, " ", err)
+
+            local bytes
+            bytes, err = sock:send("hello")
+            ngx.say("send: ", bytes, " ", err)
+
+            local line
+            line, err = sock:receive()
+            ngx.say("receive: ", line, " ", err)
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+    GET /test
+--- response_body
+connect: nil timeout
+send: nil closed
+receive: nil closed
+close: nil closed
+--- error_log
+lua tcp socket connect timed out
+
+
+
+=== TEST 7: not closed manually
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: resolver error (host not found)
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 4s;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = 80
+            local ok, err = sock:connect("blah-blah-not-found.agentzh.org", port)
+            print("connected: ", ok, " ", err, " ", not ok)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET / HTTP/1.0\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body_like
+^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(3: Host not found\))?
+connected: nil
+failed to send request: closed$
+--- error_log
+attempt to send data on a closed socket
+--- timeout: 5
+
+
+
+=== TEST 9: resolver error (timeout)
+--- config
+    server_tokens off;
+    resolver 8.8.8.8;
+    resolver_timeout 1ms;
+    location /t {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = 80
+            local ok, err = sock:connect("blah-blah-not-found.agentzh.org", port)
+            print("connected: ", ok, " ", err, " ", not ok)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET / HTTP/1.0\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+GET /t
+--- response_body_like
+^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(\d+: Operation timed out\))?
+connected: nil
+failed to send request: closed$
+--- error_log
+attempt to send data on a closed socket
+
+
+
+=== TEST 10: explicit *l pattern for receive
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err = sock:receive("*l")
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err)
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+failed to receive a line: closed
+close: nil closed
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: *a pattern for receive
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local data, err = sock:receive("*a")
+            if data then
+                ngx.say("receive: ", data)
+                ngx.say("err: ", err)
+
+            else
+                ngx.say("failed to receive: ", err)
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+request sent: 57
+receive: HTTP/1.1 200 OK\r
+Server: nginx\r
+Content-Type: text/plain\r
+Content-Length: 4\r
+Connection: close\r
+\r
+foo
+
+err: nil
+close: nil closed
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: mixing *a and *l patterns for receive
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local line, err = sock:receive("*l")
+            if line then
+                ngx.say("receive: ", line)
+                ngx.say("err: ", err)
+
+            else
+                ngx.say("failed to receive: ", err)
+            end
+
+            local data
+            data, err = sock:receive("*a")
+            if data then
+                ngx.say("receive: ", data)
+                ngx.say("err: ", err)
+
+            else
+                ngx.say("failed to receive: ", err)
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+request sent: 57
+receive: HTTP/1.1 200 OK
+err: nil
+receive: Server: nginx\r
+Content-Type: text/plain\r
+Content-Length: 4\r
+Connection: close\r
+\r
+foo
+
+err: nil
+close: nil closed
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: receive by chunks
+--- timeout: 5
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local data, err, partial = sock:receive(10)
+                if data then
+                    local len = string.len(data)
+                    if len == 10 then
+                        ngx.print("[", data, "]")
+                    else
+                        ngx.say("ERROR: returned invalid length of data: ", len)
+                    end
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", partial, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+request sent: 57
+[HTTP/1.1 2][00 OK\r
+Ser][ver: nginx][\r
+Content-][Type: text][/plain\r
+Co][ntent-Leng][th: 4\r
+Con][nection: c][lose\r
+\r
+fo]failed to receive a line: closed [o
+]
+close: nil closed
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: receive by chunks (very small buffer)
+--- timeout: 5
+--- config
+    server_tokens off;
+    lua_socket_buffer_size 1;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local data, err, partial = sock:receive(10)
+                if data then
+                    local len = string.len(data)
+                    if len == 10 then
+                        ngx.print("[", data, "]")
+                    else
+                        ngx.say("ERROR: returned invalid length of data: ", len)
+                    end
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", partial, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+request sent: 57
+[HTTP/1.1 2][00 OK\r
+Ser][ver: nginx][\r
+Content-][Type: text][/plain\r
+Co][ntent-Leng][th: 4\r
+Con][nection: c][lose\r
+\r
+fo]failed to receive a line: closed [o
+]
+close: nil closed
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: line reading (very small buffer)
+--- config
+    server_tokens off;
+    lua_socket_buffer_size 1;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+failed to receive a line: closed []
+close: nil closed
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: ngx.socket.connect (working)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local port = ngx.var.port
+            local sock, err = ngx.socket.connect("127.0.0.1", port)
+            if not sock then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected.")
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected.
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+failed to receive a line: closed []
+close: nil closed
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: ngx.socket.connect() shortcut (connection refused)
+--- config
+    location /test {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local sock, err = sock:connect("127.0.0.1", 16787)
+            if not sock then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes
+            bytes, err = sock:send("hello")
+            ngx.say("send: ", bytes, " ", err)
+
+            local line
+            line, err = sock:receive()
+            ngx.say("receive: ", line, " ", err)
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+    GET /test
+--- response_body
+failed to connect: connection refused
+--- error_log eval
+qr/connect\(\) failed \(\d+: Connection refused\)/
+
+
+
+=== TEST 18: receive by chunks (stringified size)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local data, err, partial = sock:receive("10")
+                if data then
+                    local len = string.len(data)
+                    if len == 10 then
+                        ngx.print("[", data, "]")
+                    else
+                        ngx.say("ERROR: returned invalid length of data: ", len)
+                    end
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", partial, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+request sent: 57
+[HTTP/1.1 2][00 OK\r
+Ser][ver: nginx][\r
+Content-][Type: text][/plain\r
+Co][ntent-Leng][th: 4\r
+Con][nection: c][lose\r
+\r
+fo]failed to receive a line: closed [o
+]
+close: nil closed
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: cannot survive across request boundary (send)
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua '
+            local test = require "test"
+            test.go(ngx.var.port)
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+local sock
+
+function go(port)
+    if not sock then
+        sock = ngx.socket.tcp()
+        local port = ngx.var.port
+        local ok, err = sock:connect("127.0.0.1", port)
+        if not ok then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        ngx.say("connected: ", ok)
+    end
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+end
+--- request
+GET /t
+--- response_body_like eval
+"^(?:connected: 1
+request sent: 11
+received: OK|failed to send request: closed)\$"
+
+
+
+=== TEST 20: cannot survive across request boundary (receive)
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua '
+            local test = require "test"
+            test.go(ngx.var.port)
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+local sock
+
+function go(port)
+    if not sock then
+        sock = ngx.socket.tcp()
+        local port = ngx.var.port
+        local ok, err = sock:connect("127.0.0.1", port)
+        if not ok then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        ngx.say("connected: ", ok)
+
+    else
+        local line, err, part = sock:receive()
+        if line then
+            ngx.say("received: ", line)
+
+        else
+            ngx.say("failed to receive a line: ", err, " [", part, "]")
+        end
+        return
+    end
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+end
+--- request
+GET /t
+--- response_body_like eval
+qr/^(?:connected: 1
+request sent: 11
+received: OK|failed to receive a line: closed \[nil\])$/
+
+
+
+=== TEST 21: cannot survive across request boundary (close)
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua '
+            local test = require "test"
+            test.go(ngx.var.port)
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+local sock
+
+function go(port)
+    if not sock then
+        sock = ngx.socket.tcp()
+        local port = ngx.var.port
+        local ok, err = sock:connect("127.0.0.1", port)
+        if not ok then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        ngx.say("connected: ", ok)
+
+    else
+        local ok, err = sock:close()
+        if ok then
+            ngx.say("successfully closed")
+
+        else
+            ngx.say("failed to close: ", err)
+        end
+        return
+    end
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+end
+--- request
+GET /t
+--- response_body_like eval
+qr/^(?:connected: 1
+request sent: 11
+received: OK|failed to close: closed)$/
+
+
+
+=== TEST 22: cannot survive across request boundary (connect)
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua '
+            local test = require "test"
+            test.go(ngx.var.port)
+            test.go(ngx.var.port)
+        ';
+
+        content_by_lua return;
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+local sock
+
+function go(port)
+    if not sock then
+        sock = ngx.socket.tcp()
+        local port = ngx.var.port
+        local ok, err = sock:connect("127.0.0.1", port)
+        if not ok then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        ngx.say("connected: ", ok)
+
+    else
+        local port = ngx.var.port
+        local ok, err = sock:connect("127.0.0.1", port)
+        if not ok then
+            ngx.say("failed to connect again: ", err)
+            return
+        end
+
+        ngx.say("connected again: ", ok)
+    end
+
+    local req = "flush_all\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+    ngx.say("request sent: ", bytes)
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+end
+--- request
+GET /t
+--- response_body_like eval
+qr/^(?:connected(?: again)?: 1
+request sent: 11
+received: OK
+){2}$/
+--- error_log
+lua reuse socket upstream ctx
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: connect again immediately
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected again: ", ok)
+
+            local req = "flush_all\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local line, err, part = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+
+            else
+                ngx.say("failed to receive a line: ", err, " [", part, "]")
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+connected again: 1
+request sent: 11
+received: OK
+close: 1 nil
+--- no_error_log
+[error]
+--- error_log eval
+["lua reuse socket upstream", "lua tcp socket reconnect without shutting down"]
+
+
+
+=== TEST 24: two sockets mix together
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port1 $TEST_NGINX_MEMCACHED_PORT;
+        set $port2 $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock1 = ngx.socket.tcp()
+            local sock2 = ngx.socket.tcp()
+
+            local port1 = ngx.var.port1
+            local port2 = ngx.var.port2
+
+            local ok, err = sock1:connect("127.0.0.1", port1)
+            if not ok then
+                ngx.say("1: failed to connect: ", err)
+                return
+            end
+
+            ngx.say("1: connected: ", ok)
+
+            ok, err = sock2:connect("127.0.0.1", port2)
+            if not ok then
+                ngx.say("2: failed to connect: ", err)
+                return
+            end
+
+            ngx.say("2: connected: ", ok)
+
+            local req1 = "flush_all\\r\\n"
+            local bytes, err = sock1:send(req1)
+            if not bytes then
+                ngx.say("1: failed to send request: ", err)
+                return
+            end
+            ngx.say("1: request sent: ", bytes)
+
+            local req2 = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            local bytes, err = sock2:send(req2)
+            if not bytes then
+                ngx.say("2: failed to send request: ", err)
+                return
+            end
+            ngx.say("2: request sent: ", bytes)
+
+            local line, err, part = sock1:receive()
+            if line then
+                ngx.say("1: received: ", line)
+
+            else
+                ngx.say("1: failed to receive a line: ", err, " [", part, "]")
+            end
+
+            line, err, part = sock2:receive()
+            if line then
+                ngx.say("2: received: ", line)
+
+            else
+                ngx.say("2: failed to receive a line: ", err, " [", part, "]")
+            end
+
+            ok, err = sock1:close()
+            ngx.say("1: close: ", ok, " ", err)
+
+            ok, err = sock2:close()
+            ngx.say("2: close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+1: connected: 1
+2: connected: 1
+1: request sent: 11
+2: request sent: 57
+1: received: OK
+2: received: HTTP/1.1 200 OK
+1: close: 1 nil
+2: close: 1 nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 25: send tables of string fragments
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = {"GET", " ", "/foo", " HTTP/", 1, ".", 0, "\\r\\n",
+                         "Host: localhost\\r\\n", "Connection: close\\r\\n",
+                         "\\r\\n"}
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+failed to receive a line: closed []
+close: nil closed
+--- no_error_log
+[error]
+
+
+
+=== TEST 26: send tables of string fragments (bad type "nil")
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = {"GET", " ", "/foo", " HTTP/", nil, 1, ".", 0, "\\r\\n",
+                         "Host: localhost\\r\\n", "Connection: close\\r\\n",
+                         "\\r\\n"}
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+bad argument #1 to 'send' (bad data type nil found)
+
+
+
+=== TEST 27: send tables of string fragments (bad type "boolean")
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = {"GET", " ", "/foo", " HTTP/", true, 1, ".", 0, "\\r\\n",
+                         "Host: localhost\\r\\n", "Connection: close\\r\\n",
+                         "\\r\\n"}
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+bad argument #1 to 'send' (bad data type boolean found)
+
+
+
+=== TEST 28: send tables of string fragments (bad type ngx.null)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = {"GET", " ", "/foo", " HTTP/", ngx.null, 1, ".", 0, "\\r\\n",
+                         "Host: localhost\\r\\n", "Connection: close\\r\\n",
+                         "\\r\\n"}
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+bad argument #1 to 'send' (bad data type userdata found)
+
+
+
+=== TEST 29: cosocket before location capture (tcpsock:send did not clear u->waiting)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "flush_all\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local line, err, part = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+
+            else
+                ngx.say("failed to receive a line: ", err, " [", part, "]")
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+
+            local resp = ngx.location.capture("/memc")
+            if type(resp) ~= "table" then
+                ngx.say("bad resp: type ", type(resp), ": ", resp)
+                return
+            end
+
+            ngx.print("subrequest: ", resp.status, ", ", resp.body)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /memc {
+        set $memc_cmd flush_all;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+request sent: 11
+received: OK
+close: 1 nil
+subrequest: 200, OK\r
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 30: CR in a line
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err, " [", part, "]")
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo\\r\\rbar\\rbaz")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 13
+received: Connection: close
+received: 
+received: foobarbaz
+failed to receive a line: closed []
+close: nil closed
+--- no_error_log
+[error]
+--- SKIP
+
+
+
+=== TEST 31: receive(0)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local data, err, part = sock:receive(0)
+            if not data then
+                ngx.say("failed to receive(0): ", err)
+                return
+            end
+
+            ngx.say("receive(0): [", data, "]")
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+receive(0): []
+close: 1 nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 32: send("")
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            local bytes, err = sock:send("")
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("send(\\"\\"): ", bytes)
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo foo;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+send(""): 0
+close: 1 nil
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t b/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
new file mode 100644
index 0000000..d5d4778
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
@@ -0,0 +1,152 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => blocks() * repeat_each() * 2;
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+no_long_string();
+#no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: connection refused (unix domain socket)
+--- config
+    location /test {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("unix:/tmp/nosuchfile.sock")
+            ngx.say("connect: ", ok, " ", err)
+
+            local bytes
+            bytes, err = sock:send("hello")
+            ngx.say("send: ", bytes, " ", err)
+
+            local line
+            line, err = sock:receive()
+            ngx.say("receive: ", line, " ", err)
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+    GET /test
+--- response_body
+connect: nil no such file or directory
+send: nil closed
+receive: nil closed
+close: nil closed
+
+
+
+=== TEST 2: invalid host argument
+--- http_server
+    server {
+        listen /tmp/test-nginx.sock;
+        default_type 'text/plain';
+
+        server_tokens off;
+        location /foo {
+            content_by_lua 'ngx.say("foo")';
+            more_clear_headers Date;
+        }
+    }
+--- config
+    location /test {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("/tmp/test-nginx.sock")
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+    GET /test
+--- response_body
+failed to connect: failed to parse host name "/tmp/test-nginx.sock": invalid host
+
+
+
+=== TEST 3: sanity
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
+        default_type 'text/plain';
+
+        server_tokens off;
+        location /foo {
+            content_by_lua 'ngx.say("foo")';
+            more_clear_headers Date;
+        }
+    }
+--- config
+    location /test {
+        rewrite_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+            -- req = "OK"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+
+            ngx.say("request sent: ", bytes)
+
+            while true do
+                print("calling receive")
+                local line, err = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+
+                else
+                    ngx.say("failed to receive a line: ", err)
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+
+        content_by_lua return;
+    }
+--- request
+    GET /test
+--- response_body
+connected: 1
+request sent: 57
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+failed to receive a line: closed
+close: nil closed
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
new file mode 100644
index 0000000..a563716
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
@@ -0,0 +1,352 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: exec in user thread (entry still pending)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("hello")
+        ';
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: exec in user thread (entry already quits)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+        ';
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: exec in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+        ';
+        content_by_lua return;
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: exec in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            function g()
+                ngx.sleep(1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+        content_by_lua return;
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: exec in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+
+    location = /foo {
+        echo hello world;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- wait: 0.1
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
new file mode 100644
index 0000000..8cff1d1
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
@@ -0,0 +1,1353 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: exit in user thread (entry thread is still pending to run)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+M(timer-add) {
+    if ($arg2 == 1000) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+hello in thread
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: exit in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: exit in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f")
+                ngx.exit(0)
+            end
+
+            function g()
+                ngx.sleep(1)
+                ngx.say("g")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+terminate 4: ok
+delete thread 4
+free request
+
+--- response_body
+end
+f
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: exit in user thread (entry already quits)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("exiting the user thread")
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+after
+exiting the user thread
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
+--- config
+    location /lua {
+        resolver www.google.com;
+        resolver_timeout 12s;
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("www.google.com", 80)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+F(ngx_resolve_name) {
+    printf("resolving %s\n", user_string_n($ctx->name->data, $ctx->name->len))
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_resolve_cleanup) {
+    println("lua tcp resolve cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+resolving www.google.com
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp resolve cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
+--- config
+    location /lua {
+        resolver www.google.com;
+        resolver_timeout 12s;
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("www.google.com", 80)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+F(ngx_resolve_name) {
+    printf("resolving %s\n", user_string_n($ctx->name->data, $ctx->name->len))
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_udp_resolve_cleanup) {
+    println("lua udp resolve cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+resolving www.google.com
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua udp resolve cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: exit in user thread (entry thread is still pending on tcpsock:connect)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+            sock:settimeout(12000)
+            local ok, err = sock:connect("8.8.4.4", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: exit in user thread (entry thread is still pending on tcpsock:receive)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes, ok = sock:send("blpop not_exists 2\\r\\n")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: exit in user thread (entry thread is still pending on tcpsock:receiveuntil's iterator)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes, ok = sock:send("blpop not_exists 2\\r\\n")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local it, err = sock:receiveuntil("\\r\\n")
+            if not it then
+                ngx.say("failed to receive until: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = it()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: exit in user thread (entry thread is still pending on udpsock:receive)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.udp()
+
+            local ok, err = sock:setpeername("8.8.8.8", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_udp_socket_cleanup) {
+    println("lua udp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua udp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: exit in user thread (entry thread is still pending on reqsock:receive)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.req.socket()
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive(1024)
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: exit in user thread (entry thread is still pending on ngx.req.read_body)
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.req.read_body()
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_req_body_cleanup) {
+    println("lua req body cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua req body cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: exit in user thread (entry thread is still pending on ngx.location.capture), with pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 14: exit in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 15: exit in user thread (entry thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture_multi{
+                {"/echo"},
+                {"/sleep"}
+            }
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
new file mode 100644
index 0000000..9901719
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
@@ -0,0 +1,195 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ngx.redirect() in user thread (entry thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.redirect(301)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture_multi{
+                {"/echo"},
+                {"/sleep"}
+            }
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 2: redirect in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.redirect(301)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body_like: 302 Found
+--- error_code: 302
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
new file mode 100644
index 0000000..e34a277
--- /dev/null
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
@@ -0,0 +1,1527 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 1);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple user thread without I/O
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval
+<<'_EOC_' . $::StapScript;
+
+F(ngx_http_lua_send_chain_link) {
+    printf("send link %p\n", $in)
+}
+
+F(ngx_http_core_content_phase) {
+    println("core content phase")
+}
+
+_EOC_
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: two simple user threads without I/O
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("in thread 1")
+            end
+
+            function g()
+                ngx.say("in thread 2")
+            end
+
+            ngx.say("before 1")
+            ngx.thread.spawn(f)
+            ngx.say("after 1")
+
+            ngx.say("before 2")
+            ngx.thread.spawn(g)
+            ngx.say("after 2")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+terminate 1: ok
+delete thread 2
+delete thread 3
+delete thread 1
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before 1
+in thread 1
+after 1
+before 2
+in thread 2
+after 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: simple user thread with sleep
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before sleep")
+                ngx.sleep(0.1)
+                ngx.say("after sleep")
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before sleep
+after thread create
+after sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: two simple user threads with sleep
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("1: before sleep")
+                ngx.sleep(0.2)
+                ngx.say("1: after sleep")
+            end
+
+            function g()
+                ngx.say("2: before sleep")
+                ngx.sleep(0.1)
+                ngx.say("2: after sleep")
+            end
+
+            ngx.say("1: before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("1: after thread create")
+
+            ngx.say("2: before thread create")
+            ngx.thread.spawn(g)
+            ngx.say("2: after thread create")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+delete thread 2
+terminate 4: ok
+delete thread 4
+
+--- response_body
+1: before thread create
+1: before sleep
+1: after thread create
+2: before thread create
+2: before sleep
+2: after thread create
+2: after sleep
+1: after sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: error in user thread
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.blah()
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: fail
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+after
+--- error_log
+lua user thread aborted: runtime error: [string "rewrite_by_lua"]:3: attempt to call field 'blah' (a nil value)
+
+
+
+=== TEST 6: simple user threads doing a single subrequest (entry quits early)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before capture")
+                res = ngx.location.capture("/proxy")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello world;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before capture
+after thread create
+after capture: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: simple user threads doing a single subrequest (entry also does a subrequest and quits early)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo -n hello bar;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before capture
+after thread create
+capture: hello bar
+after capture: hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: simple user threads doing a single subrequest (entry also does a subrequest and quits late)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo_sleep 0.2;
+        echo -n hello bar;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before capture
+after thread create
+after capture: hello foo
+capture: hello bar
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: two simple user threads doing single subrequests (entry also does a subrequest and quits between)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("f: before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("f: after capture: ", res.body)
+            end
+
+            function g()
+                ngx.say("g: before capture")
+                local res = ngx.location.capture("/proxy?bah")
+                ngx.say("g: after capture: ", res.body)
+            end
+
+            ngx.say("before thread 1 create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread 1 create")
+
+            ngx.say("before thread 2 create")
+            ngx.thread.spawn(g)
+            ngx.say("after thread 2 create")
+
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo_sleep 0.2;
+        echo -n hello bar;
+    }
+
+    location /bah {
+        echo_sleep 0.3;
+        echo -n hello bah;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before thread 1 create
+f: before capture
+after thread 1 create
+before thread 2 create
+g: before capture
+after thread 2 create
+f: after capture: hello foo
+capture: hello bar
+g: after capture: hello bah
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: nested user threads
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            ngx.thread.spawn(f)
+            ngx.say("after f")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 3
+delete thread 2
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before f
+before g
+hello in g()
+after f
+after g
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: nested user threads (with I/O)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.sleep(0.1)
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            ngx.thread.spawn(f)
+            ngx.say("after f")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before f
+before g
+after f
+after g
+hello in g()
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: coroutine status of a running user thread
+--- config
+    location /lua {
+        rewrite_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+                ngx.sleep(0.1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+status: running
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: coroutine status of a dead user thread
+--- config
+    location /lua {
+        rewrite_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+status: zombie
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: coroutine status of a "normal" user thread
+--- config
+    location /lua {
+        rewrite_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+                local co2 = coroutine.create(g)
+                coroutine.resume(co2)
+            end
+
+            function g()
+                ngx.sleep(0.1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+terminate 2: ok
+delete thread 2
+terminate 4: ok
+delete thread 4
+
+--- response_body
+status: normal
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: creating user threads in a user coroutine
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            local co = coroutine.create(f)
+            coroutine.resume(co)
+            ngx.say("after f")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+terminate 2: ok
+delete thread 3
+terminate 1: ok
+delete thread 1
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before f
+before g
+hello in g()
+after g
+after f
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: manual time slicing between a user thread and the entry thread
+--- config
+    location /lua {
+        rewrite_by_lua '
+            local yield = coroutine.yield
+
+            function f()
+                local self = coroutine.running()
+                ngx.say("f 1")
+                yield(self)
+                ngx.say("f 2")
+                yield(self)
+                ngx.say("f 3")
+            end
+
+            local self = coroutine.running()
+            ngx.say("0")
+            yield(self)
+            ngx.say("1")
+            ngx.thread.spawn(f)
+            ngx.say("2")
+            yield(self)
+            ngx.say("3")
+            yield(self)
+            ngx.say("4")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+0
+1
+f 1
+2
+f 2
+3
+f 3
+4
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: manual time slicing between two user threads
+--- config
+    location /lua {
+        rewrite_by_lua '
+            local yield = coroutine.yield
+
+            function f()
+                local self = coroutine.running()
+                ngx.say("f 1")
+                yield(self)
+                ngx.say("f 2")
+                yield(self)
+                ngx.say("f 3")
+            end
+
+            function g()
+                local self = coroutine.running()
+                ngx.say("g 1")
+                yield(self)
+                ngx.say("g 2")
+                yield(self)
+                ngx.say("g 3")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+            ngx.say("done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+
+--- response_body
+f 1
+g 1
+f 2
+done
+g 2
+f 3
+g 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: entry thread and a user thread flushing at the same time
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                coroutine.yield(coroutine.running)
+                ngx.flush(true)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.flush(true)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: two user threads flushing at the same time
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.say("hello from f")
+                ngx.flush(true)
+            end
+
+            function g()
+                ngx.say("hello from g")
+                ngx.flush(true)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3|create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+terminate 1: ok
+delete thread 2
+delete thread 3
+delete thread 1)
+terminate 4: ok
+delete thread 4$
+
+--- response_body
+hello from f
+hello from g
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: user threads + ngx.socket.tcp
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+                local bytes, err = sock:send("flush_all\\r\\n")
+                if not bytes then
+                    ngx.say("failed to send query: ", err)
+                    return
+                end
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+after
+received: OK
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: user threads + ngx.socket.udp
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                local sock = ngx.socket.udp()
+                local ok, err = sock:setpeername("127.0.0.1", 12345)
+                local bytes, err = sock:send("blah")
+                if not bytes then
+                    ngx.say("failed to send query: ", err)
+                    return
+                end
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+|create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3)$
+
+--- udp_listen: 12345
+--- udp_query: blah
+--- udp_reply: hello udp
+--- response_body_like chop
+^(?:before
+after
+received: hello udp
+|before
+received: hello udp
+after)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 22: simple user thread with ngx.req.read_body()
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.req.read_body()
+                local body = ngx.req.get_body_data()
+                ngx.say("body: ", body)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+hello world
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1|create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2)
+terminate 3: ok
+delete thread 3$
+
+--- response_body_like chop
+^(?:before
+body: hello world
+after|before
+after
+body: hello world)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: simple user thread with ngx.req.socket()
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                local sock = ngx.req.socket()
+                local body, err = sock:receive(11)
+                if not body then
+                    ngx.say("failed to read body: ", err)
+                    return
+                end
+
+                ngx.say("body: ", body)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+hello world
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1|create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2)
+terminate 3: ok
+delete thread 3$
+
+--- response_body_like chop
+^(?:before
+body: hello world
+after|before
+after
+body: hello world)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 24: multiple user threads + subrequests returning 404 immediately
+--- config
+    location /t {
+        rewrite_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 2 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+        content_by_lua return;
+    }
+
+    location ~ ^/proxy/(\d+) {
+        return 404;
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval
+"$::GCScript"
+.
+'
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+'
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+finalize request /proxy/1: rc:404 c:3 a:0
+post subreq: /proxy/1 rc=404, status=0 a=0
+subrequest /proxy/1 done
+terminate 2: ok
+delete thread 2
+finalize request /proxy/2: rc:404 c:2 a:0
+post subreq: /proxy/2 rc=404, status=0 a=0
+subrequest /proxy/2 done
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+finalize request /t: rc:0 c:1 a:1
+(?:finalize request /t: rc:0 c:1 a:1)?$
+
+--- response_body
+ok
+status: 404
+status: 404
+--- no_error_log
+[error]
+--- timeout: 3
+
+
+
+=== TEST 25: multiple user threads + subrequests returning 404 remotely (no wait)
+--- config
+    location /t {
+        rewrite_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 5 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+        content_by_lua return;
+    }
+
+    location ~ ^/proxy/(\d+) {
+        proxy_pass http://127.0.0.1:$server_port/d/$1;
+    }
+
+    location /d {
+        return 404;
+        #echo $uri;
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+create 4 in 1
+spawn user thread 4 in 1
+create 5 in 1
+spawn user thread 5 in 1
+create 6 in 1
+spawn user thread 6 in 1
+terminate 1: ok
+delete thread 1
+(?:terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+terminate 5: ok
+delete thread 5
+terminate 6: ok
+delete thread 6|terminate 6: ok
+delete thread 6
+terminate 5: ok
+delete thread 5
+terminate 4: ok
+delete thread 4
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+delete thread 2)
+terminate 7: ok
+delete thread 7
+
+--- response_body
+ok
+status: 404
+status: 404
+status: 404
+status: 404
+status: 404
+--- no_error_log
+[error]
+--- timeout: 6
+
+
+
+=== TEST 26: multiple user threads + subrequests returning 201 immediately
+--- config
+    location /t {
+        rewrite_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 2 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+        content_by_lua return;
+    }
+
+    location ~ ^/proxy/(\d+) {
+        content_by_lua 'ngx.exit(201)';
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval
+"$::GCScript"
+.
+'
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+'
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 4: ok
+delete thread 4
+finalize request /proxy/1: rc:201 c:3 a:0
+post subreq: /proxy/1 rc=201, status=201 a=0
+subrequest /proxy/1 done
+terminate 2: ok
+delete thread 2
+terminate 5: ok
+delete thread 5
+finalize request /proxy/2: rc:201 c:2 a:0
+post subreq: /proxy/2 rc=201, status=201 a=0
+subrequest /proxy/2 done
+terminate 3: ok
+delete thread 3
+terminate 6: ok
+delete thread 6
+finalize request /t: rc:0 c:1 a:1
+(?:finalize request /t: rc:0 c:1 a:1)?$
+
+--- response_body
+ok
+status: 201
+status: 201
+--- no_error_log
+[error]
+--- timeout: 3
+
+
+
+=== TEST 27: multiple user threads + subrequests returning 204 immediately
+--- config
+    location /t {
+        rewrite_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 2 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+        content_by_lua return;
+    }
+
+    location ~ ^/proxy/(\d+) {
+        content_by_lua 'ngx.exit(204)';
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval
+"$::GCScript"
+.
+'
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+'
+
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 4: ok
+delete thread 4
+finalize request /proxy/1: rc:204 c:3 a:0
+post subreq: /proxy/1 rc=204, status=204 a=0
+subrequest /proxy/1 done
+terminate 2: ok
+delete thread 2
+terminate 5: ok
+delete thread 5
+finalize request /proxy/2: rc:204 c:2 a:0
+post subreq: /proxy/2 rc=204, status=204 a=0
+subrequest /proxy/2 done
+terminate 3: ok
+delete thread 3
+terminate 6: ok
+delete thread 6
+finalize request /t: rc:0 c:1 a:1
+(?:finalize request /t: rc:0 c:1 a:1)?$
+
+--- response_body
+ok
+status: 204
+status: 204
+--- no_error_log
+[error]
+--- timeout: 3
+
diff --git a/debian/modules/nginx-lua/t/024-access/client-abort.t b/debian/modules/nginx-lua/t/024-access/client-abort.t
new file mode 100644
index 0000000..6b7d542
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/client-abort.t
@@ -0,0 +1,851 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = <<_EOC_;
+$t::StapThread::GCScript
+
+F(ngx_http_lua_check_broken_connection) {
+    println("lua check broken conn")
+}
+
+F(ngx_http_lua_request_cleanup) {
+    println("lua req cleanup")
+}
+_EOC_
+
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 - 1);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 0.1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 2: sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 3: sleep + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        access_by_lua '
+            ngx.sleep(1)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: subrequest + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location /sub {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 5: subrequest + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        access_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location /sub {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: fail
+lua req cleanup
+delete thread 1
+
+--- wait: 1.1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- error_log
+bad things happen
+
+
+
+=== TEST 6: subrequest + stop (proxy, ignore client abort)
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location = /sub {
+        proxy_ignore_client_abort on;
+        proxy_pass http://www.google.com:1234/;
+    }
+
+    location = /sleep {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 7: subrequest + stop (proxy, check client abort)
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location = /sub {
+        proxy_ignore_client_abort off;
+        proxy_pass http://www.google.com:1234/;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 8: need body on + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        lua_need_request_body on;
+        access_by_lua '
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 9: ngx.req.read_body + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.req.read_body()
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 10: ngx.req.socket + receive() + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive()
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 11: ngx.req.socket + receive(N) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(5)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 12: ngx.req.socket + receive(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(2)
+            ngx.sleep(1)
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:lua check broken conn
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup|lua check broken conn
+lua req cleanup
+delete thread 1)$
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: ngx.req.socket + m * receive(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(2)
+            sock:receive(2)
+            sock:receive(1)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 14: ngx.req.socket + receiveuntil + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            local it = sock:receiveuntil("\\n")
+            it()
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 15: ngx.req.socket + receiveuntil + it(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            local it = sock:receiveuntil("\\n")
+            it(2)
+            it(3)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 16: cosocket + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.req.discard_body()
+
+            local sock, err = ngx.socket.tcp()
+            if not sock then
+                ngx.log(ngx.ERR, "failed to get socket: ", err)
+                return
+            end
+
+            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect: ", err)
+                return
+            end
+
+            local bytes, err = sock:send("blpop nonexist 2\\r\\n")
+            if not bytes then
+                ngx.log(ngx.ERR, "failed to send query: ", err)
+                return
+            end
+
+            -- ngx.log(ngx.ERR, "about to receive")
+
+            local res, err = sock:receive()
+            if not res then
+                ngx.log(ngx.ERR, "failed to receive query: ", err)
+                return
+            end
+
+            ngx.log(ngx.ERR, "res: ", res)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 17: ngx.req.socket + receive n < content-length + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            error("bad")
+        ';
+        content_by_lua return;
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 100\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+failed to receive: client aborted
+
+
+
+=== TEST 18: ngx.req.socket + receive n == content-length + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            ngx.sleep(1)
+            error("bad")
+        ';
+
+        content_by_lua return;
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 19: ngx.req.socket + receive n == content-length + ignore
+--- config
+    location /t {
+        access_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            ngx.say("done")
+        ';
+        content_by_lua return;
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- shutdown: 1
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 20: ngx.req.read_body + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.req.read_body()
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- shutdown: 1
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: exec to lua + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.exec("/t2")
+        ';
+    }
+
+    location = /t2 {
+        lua_check_client_abort off;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 22: exec to proxy + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.exec("/t2")
+        ';
+    }
+
+    location = /t2 {
+        proxy_ignore_client_abort on;
+        proxy_pass http://127.0.0.1:$server_port/sleep;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 23: exec (named location) to proxy + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            ngx.exec("@t2")
+        ';
+    }
+
+    location @t2 {
+        proxy_ignore_client_abort on;
+        proxy_pass http://127.0.0.1:$server_port/sleep;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
diff --git a/debian/modules/nginx-lua/t/024-access/exit.t b/debian/modules/nginx-lua/t/024-access/exit.t
index fb61644..a66f9b0 100644
--- a/debian/modules/nginx-lua/t/024-access/exit.t
+++ b/debian/modules/nginx-lua/t/024-access/exit.t
@@ -12,12 +12,12 @@ repeat_each(2);
 #log_level('warn');
 #worker_connections(1024);
 
-plan tests => repeat_each() * (blocks() * 2);
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
-$ENV{LUA_CPATH} ||=
+our $LuaCpath = $ENV{LUA_CPATH} ||
     '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
 
 no_long_string();
@@ -60,11 +60,12 @@ GET /lua
     }
 --- request
 GET /lua
---- ignore_response
+--- response_body
+hi
 --- no_error_log
 [alert]
 --- error_log
-attempt to call ngx.exit after sending out the headers
+attempt to set status 404 via ngx.exit after sending out the response status 200
 
 
 
@@ -114,13 +115,15 @@ GET /api?user=agentz
 
 
 === TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
-
+"
 --- config
     location /memc {
         internal;
@@ -179,13 +182,15 @@ Logged in 56
 
 
 === TEST 7: working with ngx_auth_request (simplest form)
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
-
+"
 --- config
     location /memc {
         internal;
@@ -243,23 +248,25 @@ Logged in 56
 
 
 === TEST 8: working with ngx_auth_request
---- http_config
+--- http_config eval
+"
+    lua_package_cpath '$::LuaCpath';
     upstream backend {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+        drizzle_server 127.0.0.1:\$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
         drizzle_keepalive max=300 mode=single overflow=ignore;
     }
 
     upstream memc_a {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
     }
 
     upstream memc_b {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
     }
 
     upstream_list memc_cluster memc_a memc_b;
-
+"
 --- config
     location /memc {
         internal;
diff --git a/debian/modules/nginx-lua/t/024-access/on-abort.t b/debian/modules/nginx-lua/t/024-access/on-abort.t
new file mode 100644
index 0000000..46e4096
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/on-abort.t
@@ -0,0 +1,663 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = <<_EOC_;
+$t::StapThread::GCScript
+
+F(ngx_http_lua_check_broken_connection) {
+    println("lua check broken conn")
+}
+
+F(ngx_http_lua_request_cleanup) {
+    println("lua req cleanup")
+}
+_EOC_
+
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 15);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ignore the client abort event in the user callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 2: abort in the user callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 3: ngx.exit(499) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 4: ngx.exit(408) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(408)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.1
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 5: ngx.exit(-1) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(-1)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 6: ngx.exit(0) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(0)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+            ngx.log(ngx.ERR, "main handler done")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.7;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: fail
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.5
+--- ignore_response
+--- error_log
+client prematurely closed connection
+on abort called
+lua user thread aborted: runtime error: [string "access_by_lua"]:4: attempt to abort with pending subrequests
+main handler done
+
+
+
+=== TEST 7: accessing cosocket in callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+                if not ok then
+                    ngx.log(ngx.ERR, "failed to connect to redis: ", err)
+                    ngx.exit(499)
+                end
+                local bytes, err = sock:send("flushall\\r\\n")
+                if not bytes then
+                    ngx.log(ngx.ERR, "failed to send query: ", err)
+                    ngx.exit(499)
+                end
+
+                local res, err = sock:receive()
+                if not res then
+                    ngx.log(ngx.ERR, "failed to receive: ", err)
+                    ngx.exit(499)
+                end
+                ngx.log(ngx.NOTICE, "callback done: ", res)
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.2
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+callback done: +OK
+
+
+
+=== TEST 8: ignore the client abort event in the user callback (no check)
+--- config
+    location /t {
+        lua_check_client_abort off;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("cannot set on_abort: ", err)
+                return
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- response_body
+cannot set on_abort: lua_check_client_abort is off
+--- no_error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 9: regsiter on_abort callback but no client abortion
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.say("done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: ok
+delete thread 1
+delete thread 2
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- response_body
+done
+--- no_error_log
+[error]
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 10: ignore the client abort event in the user callback (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.7)
+                ngx.log(ngx.NOTICE, "main handler done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+lua check broken conn
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 11: abort in the user callback (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.7)
+                ngx.log(ngx.NOTICE, "main handler done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 3
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 12: regsiter on_abort callback but no client abortion (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.1)
+                ngx.say("done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+delete thread 2
+terminate 4: ok
+delete thread 4
+lua req cleanup
+
+--- response_body
+done
+--- no_error_log
+[error]
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 13: regsiter on_abort callback multiple times
+--- config
+    location /t {
+        lua_check_client_abort on;
+        access_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("1: cannot set on_abort: " .. err)
+                return
+            end
+
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("2: cannot set on_abort: " .. err)
+                return
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.1)
+                ngx.say("done")
+            end)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: ok
+delete thread 1
+delete thread 2
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- response_body
+2: cannot set on_abort: duplicate call
+
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/024-access/redirect.t b/debian/modules/nginx-lua/t/024-access/redirect.t
index 92a0721..3ca6c03 100644
--- a/debian/modules/nginx-lua/t/024-access/redirect.t
+++ b/debian/modules/nginx-lua/t/024-access/redirect.t
@@ -15,8 +15,6 @@ plan tests => blocks() * repeat_each() * 3;
 #no_diff();
 #no_long_string();
 
-$ENV{TEST_NGINX_PORT} ||= 1984;
-
 run_tests();
 
 __DATA__
diff --git a/debian/modules/nginx-lua/t/024-access/req-body.t b/debian/modules/nginx-lua/t/024-access/req-body.t
index cc10468..816f0ed 100644
--- a/debian/modules/nginx-lua/t/024-access/req-body.t
+++ b/debian/modules/nginx-lua/t/024-access/req-body.t
@@ -50,7 +50,7 @@ hello, world
 Host: localhost\r
 Content-Length: 100\r
 Connection: close\r
-
+\r
 hello, world"
 --- response_body:
 --- error_code_like: ^(?:500)?$
diff --git a/debian/modules/nginx-lua/t/024-access/sleep.t b/debian/modules/nginx-lua/t/024-access/sleep.t
new file mode 100644
index 0000000..8ff76e0
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/sleep.t
@@ -0,0 +1,223 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * 33;
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sleep 0.5
+--- config
+    location /test {
+        access_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.sleep(0.5)
+            local now = ngx.now()
+            ngx.say(now - before)
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:4[5-9]\d*|5[0-5]\d*|5)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+
+
+
+=== TEST 2: sleep ag
+--- config
+    location /test {
+        access_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.sleep("a")
+            local now = ngx.now()
+            ngx.say(now - before)
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /test
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+--- error_log
+bad argument #1 to 'sleep'
+
+
+
+=== TEST 3: sleep 0.5 in subrequest
+--- config
+    location /test {
+        access_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.location.capture("/sleep")
+            local now = ngx.now()
+            local delay = now - before
+            ngx.say(delay)
+            ngx.exit(200)
+        ';
+    }
+    location /sleep {
+        content_by_lua 'ngx.sleep(0.5)';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:4[5-9]\d*|5[0-9]\d*|5)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/sleep?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: sleep a in subrequest with bad argument
+--- config
+    location /test {
+        access_by_lua '
+            local res = ngx.location.capture("/sleep");
+            ngx.say(res.status)
+            ngx.exit(200)
+        ';
+    }
+    location /sleep {
+        content_by_lua 'ngx.sleep("a")';
+    }
+--- request
+GET /test
+--- response_body
+500
+--- error_log
+bad argument #1 to 'sleep'
+
+
+
+=== TEST 5: sleep 0.5 - multi-times
+--- config
+    location /test {
+        access_by_lua '
+            ngx.update_time()
+            local start = ngx.now()
+            ngx.sleep(0.3)
+            ngx.sleep(0.3)
+            ngx.sleep(0.3)
+            ngx.say(ngx.now() - start)
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:8[5-9]\d*|9[0-9]\d*|9)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: sleep 0.5 - interleaved by ngx.say() - ended by ngx.sleep
+--- config
+    location /test {
+        access_by_lua '
+            ngx.send_headers()
+            -- ngx.location.capture("/sleep")
+            ngx.sleep(1)
+            ngx.say("blah")
+            ngx.sleep(1)
+            -- ngx.location.capture("/sleep")
+            ngx.exit(200)
+        ';
+    }
+    location = /sleep {
+        echo_sleep 0.1;
+    }
+--- request
+GET /test
+--- response_body
+blah
+--- error_log
+lua ready to sleep
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: sleep 0.5 - interleaved by ngx.say() - not ended by ngx.sleep
+--- config
+    location /test {
+        access_by_lua '
+            ngx.send_headers()
+            -- ngx.location.capture("/sleep")
+            ngx.sleep(0.3)
+            ngx.say("blah")
+            ngx.sleep(0.5)
+            -- ngx.location.capture("/sleep")
+            ngx.say("hiya")
+            ngx.exit(200)
+        ';
+    }
+    location = /sleep {
+        echo_sleep 0.1;
+    }
+--- request
+GET /test
+--- response_body
+blah
+hiya
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: ngx.location.capture before and after ngx.sleep
+--- config
+    location /test {
+        access_by_lua '
+            local res = ngx.location.capture("/sub")
+            ngx.print(res.body)
+
+            ngx.sleep(0.1)
+
+            res = ngx.location.capture("/sub")
+            ngx.print(res.body)
+            ngx.exit(200)
+        ';
+    }
+    location = /hello {
+        echo hello world;
+    }
+    location = /sub {
+        proxy_pass http://127.0.0.1:$server_port/hello;
+    }
+--- request
+GET /test
+--- response_body
+hello world
+hello world
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exec.t b/debian/modules/nginx-lua/t/024-access/uthread-exec.t
new file mode 100644
index 0000000..10982a6
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exec.t
@@ -0,0 +1,352 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: exec in user thread (entry still pending)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("hello")
+        ';
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: exec in user thread (entry already quits)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+        ';
+        content_by_lua return;
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: exec in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+        ';
+        content_by_lua return;
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: exec in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            function g()
+                ngx.sleep(1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+        content_by_lua return;
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: exec in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+
+    location = /foo {
+        echo hello world;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- wait: 0.1
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exit.t b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
new file mode 100644
index 0000000..099d23a
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
@@ -0,0 +1,1353 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: exit in user thread (entry thread is still pending to run)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+M(timer-add) {
+    if ($arg2 == 1000) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+hello in thread
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: exit in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: exit in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f")
+                ngx.exit(0)
+            end
+
+            function g()
+                ngx.sleep(1)
+                ngx.say("g")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+terminate 4: ok
+delete thread 4
+free request
+
+--- response_body
+end
+f
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: exit in user thread (entry already quits)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("exiting the user thread")
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+after
+exiting the user thread
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
+--- config
+    location /lua {
+        resolver www.google.com;
+        resolver_timeout 12s;
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("www.google.com", 80)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+F(ngx_resolve_name) {
+    printf("resolving %s\n", user_string_n($ctx->name->data, $ctx->name->len))
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_resolve_cleanup) {
+    println("lua tcp resolve cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+resolving www.google.com
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp resolve cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
+--- config
+    location /lua {
+        resolver www.google.com;
+        resolver_timeout 12s;
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("www.google.com", 80)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+F(ngx_resolve_name) {
+    printf("resolving %s\n", user_string_n($ctx->name->data, $ctx->name->len))
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_udp_resolve_cleanup) {
+    println("lua udp resolve cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+resolving www.google.com
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua udp resolve cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: exit in user thread (entry thread is still pending on tcpsock:connect)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+            sock:settimeout(12000)
+            local ok, err = sock:connect("8.8.4.4", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: exit in user thread (entry thread is still pending on tcpsock:receive)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes, ok = sock:send("blpop not_exists 2\\r\\n")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: exit in user thread (entry thread is still pending on tcpsock:receiveuntil's iterator)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes, ok = sock:send("blpop not_exists 2\\r\\n")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local it, err = sock:receiveuntil("\\r\\n")
+            if not it then
+                ngx.say("failed to receive until: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = it()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: exit in user thread (entry thread is still pending on udpsock:receive)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.udp()
+
+            local ok, err = sock:setpeername("8.8.8.8", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_udp_socket_cleanup) {
+    println("lua udp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua udp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: exit in user thread (entry thread is still pending on reqsock:receive)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.req.socket()
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive(1024)
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: exit in user thread (entry thread is still pending on ngx.req.read_body)
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.req.read_body()
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_req_body_cleanup) {
+    println("lua req body cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua req body cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: exit in user thread (entry thread is still pending on ngx.location.capture), with pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+before
+hello in thread
+after
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 14: exit in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 15: exit in user thread (entry thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture_multi{
+                {"/echo"},
+                {"/sleep"}
+            }
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-redirect.t b/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
new file mode 100644
index 0000000..4bfb84a
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
@@ -0,0 +1,195 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ngx.redirect() in user thread (entry thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.redirect(301)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture_multi{
+                {"/echo"},
+                {"/sleep"}
+            }
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 2: redirect in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.redirect(301)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body_like: 302 Found
+--- error_code: 302
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-spawn.t b/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
new file mode 100644
index 0000000..50f3c8c
--- /dev/null
+++ b/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
@@ -0,0 +1,1189 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 1);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple user thread without I/O
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval
+<<'_EOC_' . $::StapScript;
+
+F(ngx_http_lua_send_chain_link) {
+    printf("send link %p\n", $in)
+}
+
+F(ngx_http_core_content_phase) {
+    println("core content phase")
+}
+
+_EOC_
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: two simple user threads without I/O
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("in thread 1")
+            end
+
+            function g()
+                ngx.say("in thread 2")
+            end
+
+            ngx.say("before 1")
+            ngx.thread.spawn(f)
+            ngx.say("after 1")
+
+            ngx.say("before 2")
+            ngx.thread.spawn(g)
+            ngx.say("after 2")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+terminate 1: ok
+delete thread 2
+delete thread 3
+delete thread 1
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before 1
+in thread 1
+after 1
+before 2
+in thread 2
+after 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: simple user thread with sleep
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before sleep")
+                ngx.sleep(0.1)
+                ngx.say("after sleep")
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before sleep
+after thread create
+after sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: two simple user threads with sleep
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("1: before sleep")
+                ngx.sleep(0.2)
+                ngx.say("1: after sleep")
+            end
+
+            function g()
+                ngx.say("2: before sleep")
+                ngx.sleep(0.1)
+                ngx.say("2: after sleep")
+            end
+
+            ngx.say("1: before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("1: after thread create")
+
+            ngx.say("2: before thread create")
+            ngx.thread.spawn(g)
+            ngx.say("2: after thread create")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+delete thread 2
+terminate 4: ok
+delete thread 4
+
+--- response_body
+1: before thread create
+1: before sleep
+1: after thread create
+2: before thread create
+2: before sleep
+2: after thread create
+2: after sleep
+1: after sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: error in user thread
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.blah()
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: fail
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+after
+--- error_log
+lua user thread aborted: runtime error: [string "access_by_lua"]:3: attempt to call field 'blah' (a nil value)
+
+
+
+=== TEST 6: simple user threads doing a single subrequest (entry quits early)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before capture")
+                res = ngx.location.capture("/proxy")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello world;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before capture
+after thread create
+after capture: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: simple user threads doing a single subrequest (entry also does a subrequest and quits early)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo -n hello bar;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before capture
+after thread create
+capture: hello bar
+after capture: hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: simple user threads doing a single subrequest (entry also does a subrequest and quits late)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo_sleep 0.2;
+        echo -n hello bar;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread create
+before capture
+after thread create
+after capture: hello foo
+capture: hello bar
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: two simple user threads doing single subrequests (entry also does a subrequest and quits between)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("f: before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("f: after capture: ", res.body)
+            end
+
+            function g()
+                ngx.say("g: before capture")
+                local res = ngx.location.capture("/proxy?bah")
+                ngx.say("g: after capture: ", res.body)
+            end
+
+            ngx.say("before thread 1 create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread 1 create")
+
+            ngx.say("before thread 2 create")
+            ngx.thread.spawn(g)
+            ngx.say("after thread 2 create")
+
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+        content_by_lua return;
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo_sleep 0.2;
+        echo -n hello bar;
+    }
+
+    location /bah {
+        echo_sleep 0.3;
+        echo -n hello bah;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before thread 1 create
+f: before capture
+after thread 1 create
+before thread 2 create
+g: before capture
+after thread 2 create
+f: after capture: hello foo
+capture: hello bar
+g: after capture: hello bah
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: nested user threads
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            ngx.thread.spawn(f)
+            ngx.say("after f")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 3
+delete thread 2
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before f
+before g
+hello in g()
+after f
+after g
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: nested user threads (with I/O)
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.sleep(0.1)
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            ngx.thread.spawn(f)
+            ngx.say("after f")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before f
+before g
+after f
+after g
+hello in g()
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: coroutine status of a running user thread
+--- config
+    location /lua {
+        access_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+                ngx.sleep(0.1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+status: running
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: coroutine status of a dead user thread
+--- config
+    location /lua {
+        access_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+status: zombie
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: coroutine status of a "normal" user thread
+--- config
+    location /lua {
+        access_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+                local co2 = coroutine.create(g)
+                coroutine.resume(co2)
+            end
+
+            function g()
+                ngx.sleep(0.1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+terminate 2: ok
+delete thread 2
+terminate 4: ok
+delete thread 4
+
+--- response_body
+status: normal
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: creating user threads in a user coroutine
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            local co = coroutine.create(f)
+            coroutine.resume(co)
+            ngx.say("after f")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+terminate 2: ok
+delete thread 3
+terminate 1: ok
+delete thread 1
+terminate 4: ok
+delete thread 4
+
+--- response_body
+before f
+before g
+hello in g()
+after g
+after f
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: manual time slicing between a user thread and the entry thread
+--- config
+    location /lua {
+        access_by_lua '
+            local yield = coroutine.yield
+
+            function f()
+                local self = coroutine.running()
+                ngx.say("f 1")
+                yield(self)
+                ngx.say("f 2")
+                yield(self)
+                ngx.say("f 3")
+            end
+
+            local self = coroutine.running()
+            ngx.say("0")
+            yield(self)
+            ngx.say("1")
+            ngx.thread.spawn(f)
+            ngx.say("2")
+            yield(self)
+            ngx.say("3")
+            yield(self)
+            ngx.say("4")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+0
+1
+f 1
+2
+f 2
+3
+f 3
+4
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: manual time slicing between two user threads
+--- config
+    location /lua {
+        access_by_lua '
+            local yield = coroutine.yield
+
+            function f()
+                local self = coroutine.running()
+                ngx.say("f 1")
+                yield(self)
+                ngx.say("f 2")
+                yield(self)
+                ngx.say("f 3")
+            end
+
+            function g()
+                local self = coroutine.running()
+                ngx.say("g 1")
+                yield(self)
+                ngx.say("g 2")
+                yield(self)
+                ngx.say("g 3")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+            ngx.say("done")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+
+--- response_body
+f 1
+g 1
+f 2
+done
+g 2
+f 3
+g 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: entry thread and a user thread flushing at the same time
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                coroutine.yield(coroutine.running)
+                ngx.flush(true)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.flush(true)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: two user threads flushing at the same time
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.say("hello from f")
+                ngx.flush(true)
+            end
+
+            function g()
+                ngx.say("hello from g")
+                ngx.flush(true)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3|create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+terminate 1: ok
+delete thread 2
+delete thread 3
+delete thread 1)
+terminate 4: ok
+delete thread 4$
+
+--- response_body
+hello from f
+hello from g
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: user threads + ngx.socket.tcp
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+                local bytes, err = sock:send("flush_all\\r\\n")
+                if not bytes then
+                    ngx.say("failed to send query: ", err)
+                    return
+                end
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before
+after
+received: OK
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: user threads + ngx.socket.udp
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                local sock = ngx.socket.udp()
+                local ok, err = sock:setpeername("127.0.0.1", 12345)
+                local bytes, err = sock:send("blah")
+                if not bytes then
+                    ngx.say("failed to send query: ", err)
+                    return
+                end
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+|create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3)$
+
+--- udp_listen: 12345
+--- udp_query: blah
+--- udp_reply: hello udp
+--- response_body_like chop
+^(?:before
+after
+received: hello udp
+|before
+received: hello udp
+after)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 22: simple user thread with ngx.req.read_body()
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                ngx.req.read_body()
+                local body = ngx.req.get_body_data()
+                ngx.say("body: ", body)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+hello world
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1|create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2)
+terminate 3: ok
+delete thread 3$
+
+--- response_body_like chop
+^(?:before
+body: hello world
+after|before
+after
+body: hello world)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: simple user thread with ngx.req.socket()
+--- config
+    location /lua {
+        access_by_lua '
+            function f()
+                local sock = ngx.req.socket()
+                local body, err = sock:receive(11)
+                if not body then
+                    ngx.say("failed to read body: ", err)
+                    return
+                end
+
+                ngx.say("body: ", body)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+        content_by_lua return;
+    }
+--- request
+POST /lua
+hello world
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1|create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2)
+terminate 3: ok
+delete thread 3$
+
+--- response_body_like chop
+^(?:before
+body: hello world
+after|before
+after
+body: hello world)$
+
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/025-codecache.t b/debian/modules/nginx-lua/t/025-codecache.t
index 91d8641..e2ddf39 100644
--- a/debian/modules/nginx-lua/t/025-codecache.t
+++ b/debian/modules/nginx-lua/t/025-codecache.t
@@ -3,9 +3,9 @@
 use lib 'lib';
 use Test::Nginx::Socket;
 
-repeat_each(1);
+repeat_each(2);
 
-plan tests => blocks() * repeat_each() * 2;
+plan tests => repeat_each() * (blocks() * 2);
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
@@ -566,3 +566,25 @@ hello, foo
 found
 found
 
+
+
+=== TEST 17: clear _G table
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    lua_code_cache off;
+    location /t {
+        content_by_lua '
+            if not _G.foo then
+                _G.foo = 1
+            else
+                _G.foo = _G.foo + 1
+            end
+            ngx.say("_G.foo: ", _G.foo)
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+_G.foo: 1
+
diff --git a/debian/modules/nginx-lua/t/026-mysql.t b/debian/modules/nginx-lua/t/026-mysql.t
index 77a71f2..eedd888 100644
--- a/debian/modules/nginx-lua/t/026-mysql.t
+++ b/debian/modules/nginx-lua/t/026-mysql.t
@@ -3,9 +3,9 @@
 use lib 'lib';
 use Test::Nginx::Socket;
 
-repeat_each(1);
+repeat_each(2);
 
-plan tests => blocks() * repeat_each() * 2;
+plan tests => blocks() * repeat_each() * 3;
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
@@ -68,6 +68,8 @@ __DATA__
 thread id = \d+
 kill status = 200
 kill body = {"errcode":0}$
+--- error_log eval
+qr{upstream timed out \(\d+: Connection timed out\) while sending query to drizzle upstream}
 
 
 
diff --git a/debian/modules/nginx-lua/t/027-multi-capture.t b/debian/modules/nginx-lua/t/027-multi-capture.t
index 7ffa216..c649d99 100644
--- a/debian/modules/nginx-lua/t/027-multi-capture.t
+++ b/debian/modules/nginx-lua/t/027-multi-capture.t
@@ -4,7 +4,6 @@ use lib 'lib';
 use Test::Nginx::Socket;
 
 repeat_each(10);
-#repeat_each(1);
 
 plan tests => repeat_each() * (blocks() * 2 + 2);
 
@@ -657,6 +656,52 @@ content f: f
     }
 --- request
     GET /main
+--- stap2
+global delta = "  "
+
+M(http-subrequest-start) {
+    r = $arg1
+    n = ngx_http_subreq_depth(r)
+    pr = ngx_http_req_parent(r)
+    printf("%sbegin %s -> %s (%d)\n", ngx_indent(n, delta),
+        ngx_http_req_uri(pr),
+        ngx_http_req_uri(r),
+        n)
+}
+
+F(ngx_http_lua_run_thread) {
+    r = $r
+    uri = ngx_http_req_uri(r)
+    if (uri == "/main") {
+        printf("run thread %s: %d\n", uri, $nret)
+        #print_ubacktrace()
+    }
+}
+
+M(http-lua-info) {
+    uri = ngx_http_req_uri($r)
+    #if (uri == "/main") {
+    printf("XXX info: %s: %s", uri, user_string($arg1))
+    #}
+}
+
+F(ngx_http_lua_post_subrequest) {
+    r = $r
+    n = ngx_http_subreq_depth(r)
+    pr = ngx_http_req_parent(r)
+
+    printf("%send %s -> %s (%d)\n", ngx_indent(n, delta),
+        ngx_http_req_uri(r),
+        ngx_http_req_uri(pr),
+        n)
+}
+
+F(ngx_http_lua_handle_subreq_responses) {
+    r = $r
+    n = ngx_http_subreq_depth(r)
+    printf("%shandle res %s (%d)\n", ngx_indent(n, delta), ngx_http_req_uri(r), n)
+}
+
 --- response_body
 rewrite a: a
 rewrite b: b
diff --git a/debian/modules/nginx-lua/t/028-req-header.t b/debian/modules/nginx-lua/t/028-req-header.t
index 5748592..e916e05 100644
--- a/debian/modules/nginx-lua/t/028-req-header.t
+++ b/debian/modules/nginx-lua/t/028-req-header.t
@@ -8,12 +8,11 @@ use Test::Nginx::Socket;
 #log_level('warn');
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => (2 * blocks() + 4) * repeat_each();
+plan tests => (2 * blocks() + 5) * repeat_each();
 
 #no_diff();
-#no_long_string();
+no_long_string();
 
 run_tests();
 
@@ -43,7 +42,7 @@ Bar: baz
     location /req-header {
         content_by_lua '
             local h = {}
-            for k, v in pairs(ngx.req.get_headers()) do
+            for k, v in pairs(ngx.req.get_headers(nil, true)) do
                 h[k] = v
             end
             ngx.say("Foo: ", h["Foo"] or "nil")
@@ -302,6 +301,7 @@ GET /bar
     }
 --- more_headers
 Foo: foo
+
 --- request
     GET /foo
 --- response_body
@@ -413,11 +413,11 @@ $s
 my @k;
 my $i = 1;
 while ($i <= 98) {
-    push @k, "X-$i";
+    push @k, "x-$i";
     $i++;
 }
-push @k, "Connection: Close\n";
-push @k, "Host: localhost\n";
+push @k, "connection: Close\n";
+push @k, "host: localhost\n";
 @k = sort @k;
 for my $k (@k) {
     if ($k =~ /\d+/) {
@@ -461,11 +461,11 @@ $s
 my @k;
 my $i = 1;
 while ($i <= 100) {
-    push @k, "X-$i";
+    push @k, "x-$i";
     $i++;
 }
-push @k, "Connection: Close\n";
-push @k, "Host: localhost\n";
+push @k, "connection: Close\n";
+push @k, "host: localhost\n";
 @k = sort @k;
 for my $k (@k) {
     if ($k =~ /\d+/) {
@@ -509,11 +509,11 @@ $s
 my @k;
 my $i = 1;
 while ($i <= 105) {
-    push @k, "X-$i";
+    push @k, "x-$i";
     $i++;
 }
-push @k, "Connection: Close\n";
-push @k, "Host: localhost\n";
+push @k, "connection: Close\n";
+push @k, "host: localhost\n";
 @k = sort @k;
 for my $k (@k) {
     if ($k =~ /\d+/) {
@@ -523,3 +523,517 @@ for my $k (@k) {
 CORE::join("", @k);
 --- timeout: 4
 
+
+
+=== TEST 22: modify subrequest req headers should not affect the parent
+--- config
+    location = /main {
+        rewrite_by_lua '
+            local res = ngx.location.capture("/sub")
+            print("subrequest: ", res.status)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location /sub {
+        content_by_lua '
+            ngx.req.set_header("foo121", 121)
+            ngx.req.set_header("foo122", 122)
+            ngx.say("ok")
+        ';
+    }
+
+    location = /echo {
+        #echo $echo_client_request_headers;
+        echo "foo121: [$http_foo121]";
+        echo "foo122: [$http_foo122]";
+    }
+--- request
+GET /main
+--- more_headers
+Foo: foo
+Bar: bar
+Foo1: foo1
+Foo2: foo2
+Foo3: foo3
+Foo4: foo4
+Foo5: foo5
+Foo6: foo6
+Foo7: foo7
+Foo8: foo8
+Foo9: foo9
+Foo10: foo10
+Foo11: foo11
+Foo12: foo12
+Foo13: foo13
+Foo14: foo14
+Foo15: foo15
+Foo16: foo16
+Foo17: foo17
+Foo18: foo18
+Foo19: foo19
+Foo20: foo20
+--- response_body
+Foo: []
+Bar: []
+--- SKIP
+
+
+
+=== TEST 23: clear_header should clear all the instances of the user custom header
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("Foo")
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location = /echo {
+        echo "Foo: [$http_foo]";
+        echo "Test-Header: [$http_test_header]";
+    }
+--- request
+GET /t
+--- more_headers
+Foo: foo
+Foo: bah
+Test-Header: 1
+--- response_body
+Foo: []
+Test-Header: [1]
+
+
+
+=== TEST 24: clear_header should clear all the instances of the builtin header
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("Content-Type")
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location = /echo {
+        echo "Content-Type: [$http_content_type]";
+        echo "Test-Header: [$http_test_header]";
+        #echo $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers
+Content-Type: foo
+Content-Type: bah
+Test-Header: 1
+--- response_body
+Content-Type: []
+Test-Header: [1]
+
+
+
+=== TEST 25: Converting POST to GET - clearing headers (bug found by Matthieu Tourne, 411 error page)
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("Content-Type")
+            ngx.req.clear_header("Content-Length")
+        ';
+
+        #proxy_pass http://127.0.0.1:8888;
+        proxy_pass http://127.0.0.1:$server_port/back;
+    }
+
+    location /back {
+        echo $echo_client_request_headers;
+    }
+--- request
+POST /t
+hello world
+--- more_headers
+Content-Type: application/ocsp-request
+Test-Header: 1
+--- response_body_like eval
+qr/Connection: close\r
+Test-Header: 1\r
+$/
+--- no_error_log
+[error]
+
+
+
+=== TEST 26: clear_header() does not duplicate subsequent headers (old bug)
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("Foo")
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location = /echo {
+        echo $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers
+Bah: bah
+Foo: foo
+Test-Header: 1
+Foo1: foo1
+Foo2: foo2
+Foo3: foo3
+Foo4: foo4
+Foo5: foo5
+Foo6: foo6
+Foo7: foo7
+Foo8: foo8
+Foo9: foo9
+Foo10: foo10
+Foo11: foo11
+Foo12: foo12
+Foo13: foo13
+Foo14: foo14
+Foo15: foo15
+Foo16: foo16
+Foo17: foo17
+Foo18: foo18
+Foo19: foo19
+Foo20: foo20
+Foo21: foo21
+Foo22: foo22
+--- response_body_like eval
+qr/Bah: bah\r
+Test-Header: 1\r
+Foo1: foo1\r
+Foo2: foo2\r
+Foo3: foo3\r
+Foo4: foo4\r
+Foo5: foo5\r
+Foo6: foo6\r
+Foo7: foo7\r
+Foo8: foo8\r
+Foo9: foo9\r
+Foo10: foo10\r
+Foo11: foo11\r
+Foo12: foo12\r
+Foo13: foo13\r
+Foo14: foo14\r
+Foo15: foo15\r
+Foo16: foo16\r
+Foo17: foo17\r
+Foo18: foo18\r
+Foo19: foo19\r
+Foo20: foo20\r
+Foo21: foo21\r
+Foo22: foo22\r
+/
+
+
+
+=== TEST 27: iterating through headers (raw form)
+--- config
+    location /t {
+        content_by_lua '
+            local h = {}
+            for k, v in pairs(ngx.req.get_headers(nil, true)) do
+                ngx.say(k, ": ", v)
+            end
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+My-Foo: bar
+Bar: baz
+--- response_body
+Host: localhost
+Bar: baz
+My-Foo: bar
+Connection: Close
+
+
+
+=== TEST 28: __index metamethod not working for "raw" mode
+--- config
+    location /t {
+        content_by_lua '
+            local h = ngx.req.get_headers(nil, true)
+            ngx.say("My-Foo-Header: ", h.my_foo_header)
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+My-Foo-Header: Hello World
+--- response_body
+My-Foo-Header: nil
+
+
+
+=== TEST 29: __index metamethod not working for the default mode
+--- config
+    location /t {
+        content_by_lua '
+            local h = ngx.req.get_headers()
+            ngx.say("My-Foo-Header: ", h.my_foo_header)
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+My-Foo-Header: Hello World
+--- response_body
+My-Foo-Header: Hello World
+
+
+
+=== TEST 30: clear input header (just more than 20 headers)
+--- config
+    location = /t {
+        rewrite_by_lua 'ngx.req.clear_header("R")';
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Host foo;
+        #proxy_pass http://127.0.0.1:1234/back;
+    }
+
+    location = /back {
+        echo $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers eval
+my $s = "User-Agent: curl\n";
+
+for my $i ('a' .. 'r') {
+    $s .= uc($i) . ": " . "$i\n"
+}
+$s
+--- response_body eval
+"GET /back HTTP/1.0\r
+Host: foo\r
+Connection: close\r
+User-Agent: curl\r
+A: a\r
+B: b\r
+C: c\r
+D: d\r
+E: e\r
+F: f\r
+G: g\r
+H: h\r
+I: i\r
+J: j\r
+K: k\r
+L: l\r
+M: m\r
+N: n\r
+O: o\r
+P: p\r
+Q: q\r
+
+"
+
+
+
+=== TEST 31: clear input header (just more than 20 headers, and add more)
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("R")
+            for i = 1, 21 do
+                ngx.req.set_header("foo-" .. i, i)
+            end
+        ';
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Host foo;
+        #proxy_pass http://127.0.0.1:1234/back;
+    }
+
+    location = /back {
+        echo $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers eval
+my $s = "User-Agent: curl\n";
+
+for my $i ('a' .. 'r') {
+    $s .= uc($i) . ": " . "$i\n"
+}
+$s
+--- response_body eval
+"GET /back HTTP/1.0\r
+Host: foo\r
+Connection: close\r
+User-Agent: curl\r
+A: a\r
+B: b\r
+C: c\r
+D: d\r
+E: e\r
+F: f\r
+G: g\r
+H: h\r
+I: i\r
+J: j\r
+K: k\r
+L: l\r
+M: m\r
+N: n\r
+O: o\r
+P: p\r
+Q: q\r
+foo-1: 1\r
+foo-2: 2\r
+foo-3: 3\r
+foo-4: 4\r
+foo-5: 5\r
+foo-6: 6\r
+foo-7: 7\r
+foo-8: 8\r
+foo-9: 9\r
+foo-10: 10\r
+foo-11: 11\r
+foo-12: 12\r
+foo-13: 13\r
+foo-14: 14\r
+foo-15: 15\r
+foo-16: 16\r
+foo-17: 17\r
+foo-18: 18\r
+foo-19: 19\r
+foo-20: 20\r
+foo-21: 21\r
+
+"
+
+
+
+=== TEST 32: clear input header (just more than 21 headers)
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("R")
+            ngx.req.clear_header("Q")
+        ';
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Host foo;
+        #proxy_pass http://127.0.0.1:1234/back;
+    }
+
+    location = /back {
+        echo $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers eval
+my $s = "User-Agent: curl\nBah: bah\n";
+
+for my $i ('a' .. 'r') {
+    $s .= uc($i) . ": " . "$i\n"
+}
+$s
+--- response_body eval
+"GET /back HTTP/1.0\r
+Host: foo\r
+Connection: close\r
+User-Agent: curl\r
+Bah: bah\r
+A: a\r
+B: b\r
+C: c\r
+D: d\r
+E: e\r
+F: f\r
+G: g\r
+H: h\r
+I: i\r
+J: j\r
+K: k\r
+L: l\r
+M: m\r
+N: n\r
+O: o\r
+P: p\r
+
+"
+
+
+
+=== TEST 33: clear input header (just more than 21 headers)
+--- config
+    location = /t {
+        rewrite_by_lua '
+            ngx.req.clear_header("R")
+            ngx.req.clear_header("Q")
+            for i = 1, 21 do
+                ngx.req.set_header("foo-" .. i, i)
+            end
+        ';
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Host foo;
+        #proxy_pass http://127.0.0.1:1234/back;
+    }
+
+    location = /back {
+        echo $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers eval
+my $s = "User-Agent: curl\nBah: bah\n";
+
+for my $i ('a' .. 'r') {
+    $s .= uc($i) . ": " . "$i\n"
+}
+$s
+--- response_body eval
+"GET /back HTTP/1.0\r
+Host: foo\r
+Connection: close\r
+User-Agent: curl\r
+Bah: bah\r
+A: a\r
+B: b\r
+C: c\r
+D: d\r
+E: e\r
+F: f\r
+G: g\r
+H: h\r
+I: i\r
+J: j\r
+K: k\r
+L: l\r
+M: m\r
+N: n\r
+O: o\r
+P: p\r
+foo-1: 1\r
+foo-2: 2\r
+foo-3: 3\r
+foo-4: 4\r
+foo-5: 5\r
+foo-6: 6\r
+foo-7: 7\r
+foo-8: 8\r
+foo-9: 9\r
+foo-10: 10\r
+foo-11: 11\r
+foo-12: 12\r
+foo-13: 13\r
+foo-14: 14\r
+foo-15: 15\r
+foo-16: 16\r
+foo-17: 17\r
+foo-18: 18\r
+foo-19: 19\r
+foo-20: 20\r
+foo-21: 21\r
+
+"
+
diff --git a/debian/modules/nginx-lua/t/030-uri-args.t b/debian/modules/nginx-lua/t/030-uri-args.t
index 41711da..b614ae8 100644
--- a/debian/modules/nginx-lua/t/030-uri-args.t
+++ b/debian/modules/nginx-lua/t/030-uri-args.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 #worker_connections(1014);
 #master_on();
 #workers(2);
-#log_level('warn');
+log_level('warn');
 
 repeat_each(2);
 #repeat_each(1);
@@ -14,8 +14,7 @@ plan tests => repeat_each() * (blocks() * 2 + 5);
 
 no_root_location();
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= $ENV{TEST_NGINX} ||= server_port();
-
+#no_shuffle();
 #no_diff();
 no_long_string();
 run_tests();
@@ -114,7 +113,7 @@ b r = 4a 2
 
 === TEST 4: empty
 --- config
-    location /lua {
+    location /t {
         content_by_lua '
             local args = ngx.req.get_uri_args()
             local keys = {}
@@ -131,7 +130,7 @@ b r = 4a 2
         ';
     }
 --- request
-GET /lua
+GET /t
 --- response_body
 done
 
@@ -358,7 +357,7 @@ done
             ngx.req.set_uri_args("hello")
             ngx.req.set_uri("/bar", true);
         ';
-        proxy_pass http://www.taobao.com:5678;
+        proxy_pass http://google.com:5678;
     }
 --- request
     GET /foo?world
@@ -440,7 +439,7 @@ foo: /bar?hello
 --- request
     GET /foo?world
 --- response_body
-err: [string "ngx.req.set_uri"]:1: attempt to use zero-length uri
+err: attempt to use zero-length uri
 foo: /foo?world
 
 
@@ -456,7 +455,7 @@ foo: /foo?world
             ngx.req.set_uri_args("hello")
             ngx.req.set_uri("/bar")
         ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT;
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
     }
 --- request
     GET /foo?world
@@ -476,7 +475,7 @@ HTTP/1.0 hello
             ngx.req.set_uri("/bar")
             ngx.req.set_uri_args({["ca t"] = "%"})
         ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT;
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
     }
 --- request
     GET /foo?world
@@ -497,7 +496,7 @@ HTTP/1.0 ca%20t=%25
             ngx.req.set_uri("/bar", true);
             ngx.exit(503)
         ';
-        proxy_pass http://www.taobao.com:5678;
+        proxy_pass http://google.com:5678;
     }
 --- request
     GET /foo?world
@@ -523,7 +522,7 @@ hello
 --- request
     GET /foo?world
 --- response_body
-err: [string "ngx.req.set_uri"]:1: attempt to call ngx.req.set_uri to do location jump in contexts other than rewrite_by_lua and rewrite_by_lua_file
+err: API disabled in the context of access_by_lua*
 
 
 
@@ -562,7 +561,7 @@ uri: /bar
 --- request
     GET /foo?world
 --- response_body
-err: [string "ngx.req.set_uri"]:1: attempt to call ngx.req.set_uri to do location jump in contexts other than rewrite_by_lua and rewrite_by_lua_file
+err: API disabled in the context of content_by_lua*
 
 
 
@@ -602,30 +601,11 @@ uri: /bar
 --- request
     GET /foo?world
 --- response_body
-err: [string "ngx.req.set_uri"]:1: attempt to call ngx.req.set_uri to do location jump in contexts other than rewrite_by_lua and rewrite_by_lua_file
+err: API disabled in the context of set_by_lua*
 
 
 
-=== TEST 25: ngx.req.set_uri without jump is allowed in set_by_lua
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        set_by_lua $dummy '
-            ngx.req.set_uri("/bar")
-            return ""
-        ';
-        echo "uri: $uri";
-    }
---- request
-    GET /foo?world
---- response_body
-uri: /bar
-
-
-
-=== TEST 26: ngx.encode_args (sanity)
+=== TEST 25: ngx.encode_args (sanity)
 --- config
     location /lua {
         set_by_lua $args_str '
@@ -641,7 +621,7 @@ a=bar&b=foo
 
 
 
-=== TEST 27: ngx.encode_args (empty table)
+=== TEST 26: ngx.encode_args (empty table)
 --- config
     location /lua {
         content_by_lua '
@@ -656,7 +636,7 @@ args:
 
 
 
-=== TEST 28: ngx.encode_args (value is table)
+=== TEST 27: ngx.encode_args (value is table)
 --- config
     location /lua {
         content_by_lua '
@@ -671,7 +651,7 @@ GET /lua
 
 
 
-=== TEST 29: ngx.encode_args (boolean values)
+=== TEST 28: ngx.encode_args (boolean values)
 --- config
     location /lua {
         content_by_lua '
@@ -686,7 +666,7 @@ GET /lua
 
 
 
-=== TEST 30: ngx.encode_args (boolean values, false)
+=== TEST 29: ngx.encode_args (boolean values, false)
 --- config
     location /lua {
         content_by_lua '
@@ -701,7 +681,7 @@ args: foo=3
 
 
 
-=== TEST 31: ngx.encode_args (bad table value)
+=== TEST 30: ngx.encode_args (bad table value)
 --- config
     location /lua {
         content_by_lua '
@@ -717,7 +697,7 @@ rc: false, err: attempt to use boolean as query arg value
 
 
 
-=== TEST 32: ngx.encode_args (bad user data value)
+=== TEST 31: ngx.encode_args (bad user data value)
 --- http_config
     lua_shared_dict dogs 1m;
 --- config
@@ -735,7 +715,7 @@ rc: false, err: attempt to use userdata as query arg value
 
 
 
-=== TEST 33: ngx.encode_args (empty table)
+=== TEST 32: ngx.encode_args (empty table)
 --- config
     location /lua {
         content_by_lua '
@@ -750,7 +730,7 @@ args:
 
 
 
-=== TEST 34: ngx.encode_args (bad arg)
+=== TEST 33: ngx.encode_args (bad arg)
 --- config
     location /lua {
         content_by_lua '
@@ -765,7 +745,7 @@ rc: false, err: bad argument #1 to '?' (table expected, got boolean)
 
 
 
-=== TEST 35: max args (limited after normal key=value)
+=== TEST 34: max args (limited after normal key=value)
 --- config
     location /lua {
         content_by_lua '
@@ -788,10 +768,11 @@ bar = 4
 foo = 3
 --- error_log
 lua hit query args limit 2
+--- log_level: debug
 
 
 
-=== TEST 36: max args (limited after an orphan key)
+=== TEST 35: max args (limited after an orphan key)
 --- config
     location /lua {
         content_by_lua '
@@ -814,10 +795,11 @@ bar = true
 foo = 3
 --- error_log
 lua hit query args limit 2
+--- log_level: debug
 
 
 
-=== TEST 37: max args (limited after an empty key, but non-emtpy values)
+=== TEST 36: max args (limited after an empty key, but non-emtpy values)
 --- config
     location /lua {
         content_by_lua '
@@ -842,10 +824,11 @@ foo = 3
 done
 --- error_log
 lua hit query args limit 2
+--- log_level: debug
 
 
 
-=== TEST 38: default max 100 args
+=== TEST 37: default max 100 args
 --- config
     location /lua {
         content_by_lua '
@@ -889,10 +872,11 @@ CORE::join("", @k);
 --- timeout: 4
 --- error_log
 lua hit query args limit 100
+--- log_level: debug
 
 
 
-=== TEST 39: custom max 102 args
+=== TEST 38: custom max 102 args
 --- config
     location /lua {
         content_by_lua '
@@ -936,10 +920,11 @@ CORE::join("", @k);
 --- timeout: 4
 --- error_log
 lua hit query args limit 102
+--- log_level: debug
 
 
 
-=== TEST 40: custom unlimited args
+=== TEST 39: custom unlimited args
 --- config
     location /lua {
         content_by_lua '
@@ -984,7 +969,7 @@ CORE::join("", @k);
 
 
 
-=== TEST 41: rewrite uri and args (multi-value args)
+=== TEST 40: rewrite uri and args (multi-value args)
 --- config
     location /bar {
         echo $server_protocol $query_string;
@@ -995,7 +980,7 @@ CORE::join("", @k);
             ngx.req.set_uri_args({a = 3, b = {5, 6}})
             ngx.req.set_uri("/bar")
         ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT;
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
     }
 --- request
     GET /foo?world
@@ -1004,7 +989,7 @@ HTTP/1.0 a=3&b=5&b=6
 
 
 
-=== TEST 42: ngx.decode_args (sanity)
+=== TEST 41: ngx.decode_args (sanity)
 --- config
     location /lua {
         content_by_lua '
@@ -1022,7 +1007,7 @@ b = foo
 
 
 
-=== TEST 43: ngx.decode_args (multi-value)
+=== TEST 42: ngx.decode_args (multi-value)
 --- config
     location /lua {
         content_by_lua '
@@ -1040,7 +1025,7 @@ b = foo
 
 
 
-=== TEST 44: ngx.decode_args (empty string)
+=== TEST 43: ngx.decode_args (empty string)
 --- config
     location /lua {
         content_by_lua '
@@ -1056,7 +1041,7 @@ n = 0
 
 
 
-=== TEST 45: ngx.decode_args (boolean args)
+=== TEST 44: ngx.decode_args (boolean args)
 --- config
     location /lua {
         content_by_lua '
@@ -1074,7 +1059,7 @@ b = true
 
 
 
-=== TEST 46: ngx.decode_args (empty value args)
+=== TEST 45: ngx.decode_args (empty value args)
 --- config
     location /lua {
         content_by_lua '
@@ -1092,7 +1077,7 @@ b =
 
 
 
-=== TEST 47: ngx.decode_args (max_args = 1)
+=== TEST 46: ngx.decode_args (max_args = 1)
 --- config
     location /lua {
         content_by_lua '
@@ -1110,7 +1095,7 @@ b = nil
 
 
 
-=== TEST 48: ngx.decode_args (max_args = -1)
+=== TEST 47: ngx.decode_args (max_args = -1)
 --- config
     location /lua {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/034-match.t b/debian/modules/nginx-lua/t/034-match.t
index 96d95b4..5f17f05 100644
--- a/debian/modules/nginx-lua/t/034-match.t
+++ b/debian/modules/nginx-lua/t/034-match.t
@@ -9,7 +9,7 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 4);
+plan tests => repeat_each() * (blocks() * 2 + 5);
 
 #no_diff();
 no_long_string();
@@ -641,7 +641,7 @@ regex: (?:>[\w\s]*</?\w{2,}>)
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log chop
-lua handler aborted: runtime error: [string "content_by_lua"]:2: bad argument #2 to 'match' (failed to compile regex "([0-9]+": pcre_compile() failed: missing ) in "([0-9]+")
+lua entry thread aborted: runtime error: [string "content_by_lua"]:2: bad argument #2 to 'match' (failed to compile regex "([0-9]+": pcre_compile() failed: missing ) in "([0-9]+")
 
 
 
@@ -702,3 +702,27 @@ done
 --- response_body
 done
 
+
+
+=== TEST 34: non-empty subject, empty pattern
+--- config
+    location /re {
+        content_by_lua '
+            local ctx = {}
+            local m = ngx.re.match("hello, 1234", "", "", ctx)
+            if m then
+                ngx.say("pos: ", ctx.pos)
+                ngx.say("m: ", m[0])
+            else
+                ngx.say("not matched!")
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+pos: 0
+m: 
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/035-gmatch.t b/debian/modules/nginx-lua/t/035-gmatch.t
index f7b7cf8..02d1723 100644
--- a/debian/modules/nginx-lua/t/035-gmatch.t
+++ b/debian/modules/nginx-lua/t/035-gmatch.t
@@ -7,9 +7,11 @@ use Test::Nginx::Socket;
 #workers(2);
 #log_level('warn');
 
-repeat_each(2);
+repeat_each(5);
 
-plan tests => repeat_each() * (blocks() * 2);
+plan tests => repeat_each() * (blocks() * 2 + 1);
+
+our $HtmlDir = html_dir;
 
 #no_diff();
 #no_long_string();
@@ -309,6 +311,10 @@ baz
     }
 --- request
     GET /re
+--- stap2
+F(ngx_http_lua_ngx_re_gmatch_iterator) { println("iterator") }
+F(ngx_http_lua_ngx_re_gmatch_gc) { println("gc") }
+F(ngx_http_lua_ngx_re_gmatch_cleanup) { println("cleanup") }
 --- response_body
 hello
 okay
@@ -405,3 +411,103 @@ done
 --- response_body
 hello
 
+
+
+=== TEST 18: gmatch matched but no iterate and early forced GC
+--- config
+    location /re {
+        content_by_lua '
+            local a = {}
+            for i = 1, 3 do
+                it = ngx.re.gmatch("hello, world", "[a-z]+")
+                it()
+                collectgarbage()
+                table.insert(a, {"hello", "world"})
+            end
+            ngx.say("done")
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+done
+
+
+
+=== TEST 19: gmatch iterator used by another request
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;;';"
+--- config
+    location /main {
+        content_by_lua '
+            package.loaded.foo = nil
+
+            local res = ngx.location.capture("/t")
+            if res.status == 200 then
+                ngx.print(res.body)
+            else
+                ngx.say("sr failed: ", res.status)
+            end
+
+            res = ngx.location.capture("/t")
+            if res.status == 200 then
+                ngx.print(res.body)
+            else
+                ngx.say("sr failed: ", res.status)
+            end
+        ';
+    }
+
+    location /t {
+        content_by_lua '
+            local foo = require "foo"
+            local m = foo.go()
+            ngx.say(m and "matched" or "no")
+        ';
+    }
+--- user_files
+>>> foo.lua
+module("foo", package.seeall)
+
+local it
+
+function go()
+    if not it then
+        it = ngx.re.gmatch("hello, world", "[a-z]+")
+    end
+
+    return it()
+end
+--- request
+    GET /main
+--- response_body
+matched
+sr failed: 500
+--- error_log
+attempt to use ngx.re.gmatch iterator in a request that did not create it
+
+
+
+=== TEST 20: gmatch (empty matched string)
+--- config
+    location /re {
+        content_by_lua '
+            for m in ngx.re.gmatch("hello", "a|") do
+                if m then
+                    ngx.say("matched: [", m[0], "]")
+                else
+                    ngx.say("not matched: ", m)
+                end
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+matched: []
+matched: []
+matched: []
+matched: []
+matched: []
+matched: []
+
diff --git a/debian/modules/nginx-lua/t/037-gsub.t b/debian/modules/nginx-lua/t/037-gsub.t
index 47e0dcd..68d88e2 100644
--- a/debian/modules/nginx-lua/t/037-gsub.t
+++ b/debian/modules/nginx-lua/t/037-gsub.t
@@ -9,7 +9,7 @@ log_level('warn');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2);
+plan tests => repeat_each() * (blocks() * 2 + 8);
 
 #no_diff();
 no_long_string();
@@ -179,3 +179,187 @@ hello, world
 {foohbarhbaz}
 2
 
+
+
+=== TEST 10: gsub with a patch matching an empty substring (string template)
+--- config
+    location /re {
+        content_by_lua '
+            local s, n = ngx.re.gsub("hello", "a|", "b")
+            ngx.say("s: ", s)
+            ngx.say("n: ", n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+s: bhbeblblbob
+n: 6
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: gsub with a patch matching an empty substring (string template, empty subj)
+--- config
+    location /re {
+        content_by_lua '
+            local s, n = ngx.re.gsub("", "a|", "b")
+            ngx.say("s: ", s)
+            ngx.say("n: ", n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+s: b
+n: 1
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: gsub with a patch matching an empty substring (func)
+--- config
+    location /re {
+        content_by_lua '
+            local s, n = ngx.re.gsub("hello", "a|", function () return "b" end)
+            ngx.say("s: ", s)
+            ngx.say("n: ", n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+s: bhbeblblbob
+n: 6
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: gsub with a patch matching an empty substring (func, empty subj)
+--- config
+    location /re {
+        content_by_lua '
+            local s, n = ngx.re.gsub("", "a|", function () return "b" end)
+            ngx.say("s: ", s)
+            ngx.say("n: ", n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+s: b
+n: 1
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: big subject string exceeding the luabuf chunk size (with trailing unmatched data, func repl)
+--- config
+    location /re {
+        content_by_lua '
+            local subj = string.rep("a", 8000)
+                .. string.rep("b", 1000)
+                .. string.rep("a", 8000)
+                .. string.rep("b", 1000)
+                .. "aaa"
+
+            local function repl(m)
+                return string.rep("c", string.len(m[0]))
+            end
+
+            local s, n = ngx.re.gsub(subj, "b+", repl)
+            ngx.say(s)
+            ngx.say(n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body eval
+("a" x 8000) . ("c" x 1000) . ("a" x 8000) . ("c" x 1000)
+. "aaa
+2
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: big subject string exceeding the luabuf chunk size (without trailing unmatched data, func repl)
+--- config
+    location /re {
+        content_by_lua '
+            local subj = string.rep("a", 8000)
+                .. string.rep("b", 1000)
+                .. string.rep("a", 8000)
+                .. string.rep("b", 1000)
+
+            local function repl(m)
+                return string.rep("c", string.len(m[0]))
+            end
+
+            local s, n = ngx.re.gsub(subj, "b+", repl)
+            ngx.say(s)
+            ngx.say(n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body eval
+("a" x 8000) . ("c" x 1000) . ("a" x 8000) . ("c" x 1000)
+. "\n2\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: big subject string exceeding the luabuf chunk size (with trailing unmatched data, str repl)
+--- config
+    location /re {
+        content_by_lua '
+            local subj = string.rep("a", 8000)
+                .. string.rep("b", 1000)
+                .. string.rep("a", 8000)
+                .. string.rep("b", 1000)
+                .. "aaa"
+
+            local s, n = ngx.re.gsub(subj, "b(b+)(b)", "$1 $2")
+            ngx.say(s)
+            ngx.say(n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body eval
+("a" x 8000) . ("b" x 998) . " b" . ("a" x 8000) . ("b" x 998) . " baaa
+2
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: big subject string exceeding the luabuf chunk size (without trailing unmatched data, str repl)
+--- config
+    location /re {
+        content_by_lua '
+            local subj = string.rep("a", 8000)
+                .. string.rep("b", 1000)
+                .. string.rep("a", 8000)
+                .. string.rep("b", 1000)
+
+            local s, n = ngx.re.gsub(subj, "b(b+)(b)", "$1 $2")
+            ngx.say(s)
+            ngx.say(n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body eval
+("a" x 8000) . ("b" x 998) . " b" . ("a" x 8000) . ("b" x 998) . " b\n2\n"
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/041-header-filter.t b/debian/modules/nginx-lua/t/041-header-filter.t
index 05d5881..4413f1a 100644
--- a/debian/modules/nginx-lua/t/041-header-filter.t
+++ b/debian/modules/nginx-lua/t/041-header-filter.t
@@ -7,10 +7,11 @@ use Test::Nginx::Socket;
 #master_process_enabled(1);
 #log_level('warn');
 
-repeat_each(2);
-#repeat_each(10000);
+log_level('debug');
 
-plan tests => blocks() * repeat_each() * 3 - repeat_each() * 1;
+repeat_each(2);
+
+plan tests => repeat_each() * 91;
 
 #no_diff();
 #no_long_string();
@@ -376,3 +377,389 @@ Content-Type: text/read-plain
 Hi
 
 
+
+=== TEST 18: ngx.ctx available in header_filter_by_lua (already defined)
+--- config
+    location /lua {
+        content_by_lua 'ngx.ctx.counter = 3 ngx.say(ngx.ctx.counter)';
+        header_filter_by_lua 'ngx.log(ngx.ERR, "ngx.ctx.counter: ", ngx.ctx.counter)';
+    }
+--- request
+GET /lua
+--- response_body
+3
+--- error_log
+ngx.ctx.counter: 3
+lua release ngx.ctx
+
+
+
+=== TEST 19: ngx.ctx available in header_filter_by_lua (not defined yet)
+--- config
+    location /lua {
+        echo hello;
+        header_filter_by_lua '
+            ngx.log(ngx.ERR, "ngx.ctx.counter: ", ngx.ctx.counter)
+            ngx.ctx.counter = "hello world"
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+hello
+--- error_log
+ngx.ctx.counter: nil
+lua release ngx.ctx
+
+
+
+=== TEST 20: global got cleared for each single request
+--- config
+    location /lua {
+        set $foo '';
+        content_by_lua '
+            ngx.send_headers()
+            ngx.say(ngx.var.foo)
+        ';
+        header_filter_by_lua '
+            if not foo then
+                foo = 1
+            else
+                foo = foo + 1
+            end
+            ngx.var.foo = foo
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+1
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: lua error (string)
+--- config
+    location /lua {
+        set $foo '';
+        content_by_lua '
+            ngx.send_headers()
+            ngx.say(ngx.var.foo)
+        ';
+        header_filter_by_lua '
+            error("Something bad")
+        ';
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+failed to run header_filter_by_lua*: [string "header_filter_by_lua"]:2: Something bad
+--- no_error_log
+[alert]
+
+
+
+=== TEST 22: lua error (nil)
+--- config
+    location /lua {
+        set $foo '';
+        content_by_lua '
+            ngx.send_headers()
+            ngx.say(ngx.var.foo)
+        ';
+        header_filter_by_lua '
+            error(nil)
+        ';
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+failed to run header_filter_by_lua*: unknown reason
+--- no_error_log
+[alert]
+
+
+
+=== TEST 23: no ngx.print
+--- config
+    location /lua {
+        header_filter_by_lua "ngx.print(32) return 1";
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 24: no ngx.say
+--- config
+    location /lua {
+        header_filter_by_lua "ngx.say(32) return 1";
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 25: no ngx.flush
+--- config
+    location /lua {
+        header_filter_by_lua "ngx.flush()";
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 26: no ngx.eof
+--- config
+    location /lua {
+        header_filter_by_lua "ngx.eof()";
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 27: no ngx.send_headers
+--- config
+    location /lua {
+        header_filter_by_lua "ngx.send_headers()";
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 28: no ngx.location.capture
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.location.capture("/sub")';
+        echo ok;
+    }
+
+    location /sub {
+        echo sub;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 29: no ngx.location.capture_multi
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.location.capture_multi{{"/sub"}}';
+        echo ok;
+    }
+
+    location /sub {
+        echo sub;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 30: no ngx.exit
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.exit(0)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 31: no ngx.redirect
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.redirect("/blah")';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 32: no ngx.exec
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.exec("/blah")';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 33: no ngx.req.set_uri(uri, true)
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.req.set_uri("/blah", true)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 34: ngx.req.set_uri(uri) exists
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.req.set_uri("/blah") return 1';
+        content_by_lua '
+            ngx.send_headers()
+            ngx.say("uri: ", ngx.var.uri)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+uri: /blah
+--- no_error_log
+[error]
+
+
+
+=== TEST 35: no ngx.req.read_body()
+--- config
+    location /lua {
+        header_filter_by_lua 'ngx.req.read_body()';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 36: no ngx.req.socket()
+--- config
+    location /lua {
+        header_filter_by_lua 'return ngx.req.socket()';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 37: no ngx.socket.tcp()
+--- config
+    location /lua {
+        header_filter_by_lua 'return ngx.socket.tcp()';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 38: no ngx.socket.connect()
+--- config
+    location /lua {
+        header_filter_by_lua 'return ngx.socket.connect("127.0.0.1", 80)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 39: clear content-length
+--- config
+    location /lua {
+        content_by_lua '
+            ngx.header.content_length = 12
+            ngx.say("hello world")
+        ';
+        header_filter_by_lua 'ngx.header.content_length = nil';
+    }
+--- request
+GET /lua
+--- response_headers
+!content-length
+--- response_body
+hello world
+
+
+
+=== TEST 40: backtrace
+--- config
+    location /t {
+        header_filter_by_lua '
+            function foo()
+                bar()
+            end
+
+            function bar()
+                error("something bad happened")
+            end
+
+            foo()
+        ';
+        echo ok;
+    }
+--- request
+    GET /t
+--- ignore_response
+--- error_log
+something bad happened
+stack traceback:
+in function 'error'
+in function 'bar'
+in function 'foo'
+
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/nginx-lua/t/043-shdict.t
index 490ac35..be87c69 100644
--- a/debian/modules/nginx-lua/t/043-shdict.t
+++ b/debian/modules/nginx-lua/t/043-shdict.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 5);
+plan tests => repeat_each() * (blocks() * 2 + 7);
 
 #no_diff();
 no_long_string();
@@ -363,6 +363,7 @@ false expecting exactly two arguments, but only seen 1
 --- config
     location = /test {
         content_by_lua '
+            collectgarbage("collect")
             local dogs = ngx.shared.dogs
             local res, err, forcible = dogs:set("foo", string.rep("helloworld", 10000))
             ngx.say(res, " ", err, " ", forcible)
@@ -372,6 +373,9 @@ false expecting exactly two arguments, but only seen 1
 GET /test
 --- response_body
 false no memory false
+--- log_level: info
+--- error_log eval
+qr/\[info\] .* ngx_slab_alloc\(\) failed: no memory in lua_shared_dict zone "dogs"/
 
 
 
@@ -631,6 +635,7 @@ hello
 --- config
     location = /test {
         content_by_lua '
+            collectgarbage("collect")
             local dogs = ngx.shared.dogs
             dogs:set("bah", "hello")
             local res, err, forcible = dogs:set("foo", string.rep("helloworld", 10000))
@@ -641,6 +646,9 @@ hello
 GET /test
 --- response_body
 false no memory true
+--- log_level: info
+--- error_log eval
+qr/\[info\] .* ngx_slab_alloc\(\) failed: no memory in lua_shared_dict zone "dogs"/
 
 
 
@@ -1077,3 +1085,291 @@ GET /t
 nil nil
 nil nil
 
+
+
+=== TEST 45: flush_expires
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", "x", 1)
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 100)
+
+            ngx.sleep(1.5)
+
+            local num = dogs:flush_expired()
+            ngx.say(num)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+1
+
+
+
+=== TEST 46: flush_expires with number
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            for i=1,100 do
+                dogs:set(tostring(i), "x", 1)
+            end
+
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 100)
+
+            ngx.sleep(1.5)
+
+            local num = dogs:flush_expired(42)
+            ngx.say(num)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+42
+
+
+
+=== TEST 47: flush_expires an empty dict
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            local num = dogs:flush_expired()
+            ngx.say(num)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+0
+
+
+
+=== TEST 48: flush_expires a dict without expired items
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 100)
+
+            local num = dogs:flush_expired()
+            ngx.say(num)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+0
+
+
+
+=== TEST 49: list all keys in a shdict
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 0)
+            local keys = dogs:get_keys()
+            ngx.say(#keys)
+            table.sort(keys)
+            for _,k in ipairs(keys) do
+                ngx.say(k)
+            end
+        ';
+    }
+--- request
+GET /t
+--- response_body
+2
+bah
+bar
+
+
+
+=== TEST 50: list keys in a shdict with limit
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 0)
+            local keys = dogs:get_keys(1)
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+1
+
+
+
+=== TEST 51: list all keys in a shdict with expires
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", "x", 1)
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 100)
+
+            ngx.sleep(1.5)
+
+            local keys = dogs:get_keys()
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+2
+
+
+
+=== TEST 52: list keys in a shdict with limit larger than number of keys
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            dogs:set("bah", "y", 0)
+            dogs:set("bar", "z", 0)
+            local keys = dogs:get_keys(3)
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+2
+
+
+
+=== TEST 53: list keys in an empty shdict
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            local keys = dogs:get_keys()
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+0
+
+
+
+=== TEST 54: list keys in an empty shdict with a limit
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            local keys = dogs:get_keys(4)
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+0
+
+
+
+=== TEST 55: list all keys in a shdict with all keys expired
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", "x", 1)
+            dogs:set("bah", "y", 1)
+            dogs:set("bar", "z", 1)
+
+            ngx.sleep(1.5)
+
+            local keys = dogs:get_keys()
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+0
+
+
+
+=== TEST 56: list all keys in a shdict with more than 1024 keys with no limit set
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            for i=1,2048 do
+                dogs:set(tostring(i), i)
+            end
+            local keys = dogs:get_keys()
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+1024
+
+
+
+=== TEST 57: list all keys in a shdict with more than 1024 keys with 0 limit set
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            for i=1,2048 do
+                dogs:set(tostring(i), i)
+            end
+            local keys = dogs:get_keys(0)
+            ngx.say(#keys)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+2048
+
diff --git a/debian/modules/nginx-lua/t/044-req-body.t b/debian/modules/nginx-lua/t/044-req-body.t
index bdc3400..1e167d7 100644
--- a/debian/modules/nginx-lua/t/044-req-body.t
+++ b/debian/modules/nginx-lua/t/044-req-body.t
@@ -6,9 +6,9 @@ use Test::Nginx::Socket;
 #master_process_enabled(1);
 #log_level('warn');
 
-#repeat_each(2);
+repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 1);
+plan tests => repeat_each() * (blocks() * 4 + 5);
 
 #no_diff();
 no_long_string();
@@ -50,7 +50,7 @@ hello, world
 Host: localhost\r
 Content-Length: 100\r
 Connection: close\r
-
+\r
 hello, world"
 --- response_body:
 --- error_code_like: ^(?:500)?$
@@ -107,51 +107,7 @@ sub: foo
 
 
 
-=== TEST 5: read_body not allowed in set_by_lua
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        set_by_lua $has_read_body '
-            return ngx.req.read_body and "defined" or "undef"
-        ';
-        echo "ngx.req.read_body: $has_read_body";
-    }
---- request
-GET /test
---- response_body
-ngx.req.read_body: undef
---- no_error_log
-[error]
-
-
-
-=== TEST 6: read_body not allowed in set_by_lua
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        set $bool '';
-        header_filter_by_lua '
-             ngx.var.bool = (ngx.req.read_body and "defined" or "undef")
-        ';
-        content_by_lua '
-            ngx.send_headers()
-            ngx.say("ngx.req.read_body: ", ngx.var.bool)
-        ';
-    }
---- request
-GET /test
---- response_body
-ngx.req.read_body: undef
---- no_error_log
-[error]
-
-
-
-=== TEST 7: discard body
+=== TEST 5: discard body
 --- config
     location = /foo {
         content_by_lua '
@@ -179,7 +135,7 @@ hiya, world"]
 
 
 
-=== TEST 8: not discard body
+=== TEST 6: not discard body
 --- config
     location = /foo {
         content_by_lua '
@@ -208,7 +164,7 @@ qr/400 Bad Request/]
 
 
 
-=== TEST 9: read buffered body and retrieve the data
+=== TEST 7: read buffered body and retrieve the data
 --- config
     location = /test {
         content_by_lua '
@@ -226,7 +182,7 @@ hello, world
 
 
 
-=== TEST 10: read buffered body to file and call get_body_data
+=== TEST 8: read buffered body to file and call get_body_data
 --- config
     client_body_in_file_only on;
     location = /test {
@@ -245,7 +201,7 @@ nil
 
 
 
-=== TEST 11: read buffered body to file and call get_body_file
+=== TEST 9: read buffered body to file and call get_body_file
 --- config
     client_body_in_file_only on;
     location = /test {
@@ -263,7 +219,7 @@ hello, world
 
 
 
-=== TEST 12: read buffered body to memory and retrieve the file
+=== TEST 10: read buffered body to memory and retrieve the file
 --- config
     location = /test {
         content_by_lua '
@@ -281,7 +237,7 @@ nil
 
 
 
-=== TEST 13: read buffered body to memory and reset it with data in memory
+=== TEST 11: read buffered body to memory and reset it with data in memory
 --- config
     location = /test {
         content_by_lua '
@@ -304,7 +260,7 @@ hiya, dear
 
 
 
-=== TEST 14: read body to file and then override it with data in memory
+=== TEST 12: read body to file and then override it with data in memory
 --- config
     client_body_in_file_only on;
 
@@ -327,7 +283,7 @@ hello, baby
 
 
 
-=== TEST 15: do not read the current request body but replace it with our own in memory
+=== TEST 13: do not read the current request body but replace it with our own in memory
 --- config
     client_body_in_file_only on;
 
@@ -356,7 +312,7 @@ hello, baby
 
 
 
-=== TEST 16: read buffered body to file and reset it to a new file
+=== TEST 14: read buffered body to file and reset it to a new file
 --- config
     client_body_in_file_only on;
 
@@ -395,7 +351,7 @@ Will you change this world?
 
 
 
-=== TEST 17: read buffered body to file and reset it to a new file
+=== TEST 15: read buffered body to file and reset it to a new file
 --- config
     client_body_in_file_only on;
 
@@ -434,7 +390,7 @@ Will you change this world?
 
 
 
-=== TEST 18: read buffered body to file and reset it to a new file (auto-clean)
+=== TEST 16: read buffered body to file and reset it to a new file (auto-clean)
 --- config
     client_body_in_file_only on;
 
@@ -472,7 +428,7 @@ b.txt exists: yes
 
 
 
-=== TEST 19: read buffered body to memoary and reset it to a new file (auto-clean)
+=== TEST 17: read buffered body to memoary and reset it to a new file (auto-clean)
 --- config
     client_body_in_file_only off;
 
@@ -506,7 +462,7 @@ qr/500 Internal Server Error/]
 
 
 
-=== TEST 20: read buffered body to memoary and reset it to a new file (no auto-clean)
+=== TEST 18: read buffered body to memoary and reset it to a new file (no auto-clean)
 --- config
     client_body_in_file_only off;
 
@@ -542,7 +498,7 @@ Will you change this world?
 
 
 
-=== TEST 21: no request body and reset it to a new file (auto-clean)
+=== TEST 19: no request body and reset it to a new file (auto-clean)
 --- config
     client_body_in_file_only off;
 
@@ -577,7 +533,7 @@ Will you change this world?
 
 
 
-=== TEST 22: no request body and reset it to a new file (no auto-clean)
+=== TEST 20: no request body and reset it to a new file (no auto-clean)
 --- config
     client_body_in_file_only off;
 
@@ -608,12 +564,12 @@ qr/500 Internal Server Error/]
 --- error_code eval
 [200, 500]
 --- error_log eval
-[qr{\[error\].*? lua handler aborted: runtime error: \[string "rewrite_by_lua"\]:3: stat\(\) "[^"]+/a\.txt" failed}
+[qr{\[error\].*? lua entry thread aborted: runtime error: \[string "rewrite_by_lua"\]:3: stat\(\) "[^"]+/a\.txt" failed}
 ]
 
 
 
-=== TEST 23: read buffered body to memory and reset it with data in memory + proxy
+=== TEST 21: read buffered body to memory and reset it with data in memory + proxy
 --- config
     location = /test {
         rewrite_by_lua '
@@ -636,7 +592,7 @@ hiya, dear dear friend!
 
 
 
-=== TEST 24: discard request body and reset it to a new file (no auto-clean)
+=== TEST 22: discard request body and reset it to a new file (no auto-clean)
 --- config
     client_body_in_file_only off;
 
@@ -670,7 +626,7 @@ qr/500 Internal Server Error/]
 
 
 
-=== TEST 25: discard body and then read
+=== TEST 23: discard body and then read
 --- config
     location = /test {
         content_by_lua '
@@ -691,7 +647,7 @@ hello, world"]
 
 
 
-=== TEST 26: set empty request body in memory
+=== TEST 24: set empty request body in memory
 --- config
     location = /test {
         rewrite_by_lua '
@@ -717,7 +673,7 @@ hello, world"]
 
 
 
-=== TEST 27: set empty request body in file
+=== TEST 25: set empty request body in file
 --- config
     location = /test {
         rewrite_by_lua '
@@ -745,7 +701,7 @@ hello, world"]
 
 
 
-=== TEST 28: read and set body
+=== TEST 26: read and set body
 --- config
     location /test {
         lua_need_request_body on;
@@ -780,7 +736,7 @@ B=HELLO&A=1&A=2&C=WORLD
 
 
 
-=== TEST 29: read buffered body to memory and reset it with data in memory + proxy twice
+=== TEST 27: read buffered body to memory and reset it with data in memory + proxy twice
 --- config
     location = /test {
         rewrite_by_lua '
@@ -804,7 +760,7 @@ howdy, my dear little sister!
 
 
 
-=== TEST 30: read buffered body to memory and reset it with data in memory and then reset it to file
+=== TEST 28: read buffered body to memory and reset it with data in memory and then reset it to file
 --- config
     location = /test {
         rewrite_by_lua '
@@ -831,7 +787,7 @@ howdy, my dear little sister!
 
 
 
-=== TEST 31: read buffered body to memory and reset it with empty string + proxy twice
+=== TEST 29: read buffered body to memory and reset it with empty string + proxy twice
 --- config
     location = /test {
         rewrite_by_lua '
@@ -854,7 +810,7 @@ hello, world
 
 
 
-=== TEST 32: multi-buffer request body
+=== TEST 30: multi-buffer request body
 --- config
     location /foo {
         default_type text/css;
@@ -880,3 +836,481 @@ srcache_store: request body len: 55
 --- no_error_log
 [error]
 
+
+
+=== TEST 31: init & append & finish (just in buffer)
+--- config
+    location /t {
+        content_by_lua '
+            ngx.req.init_body(4)
+            ngx.req.append_body("h")
+            ngx.req.append_body("ell")
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+        ';
+    }
+--- request
+    GET /t
+--- stap2
+F(ngx_http_lua_write_request_body) {
+    b = ngx_chain_buf($body)
+    println("buf: ", b,
+        ", in-mem: ", ngx_buf_in_memory(b),
+        ", size: ", ngx_buf_size(b),
+        ", data: ", ngx_buf_data(b))
+}
+--- response_body
+content length: 4
+body: hell
+--- no_error_log
+[error]
+
+
+
+=== TEST 32: init & append & finish (exceeding the buffer size)
+--- config
+    location /t {
+        content_by_lua '
+            ngx.req.init_body(4)
+            ngx.req.append_body("h")
+            ngx.req.append_body("ell")
+            ngx.req.append_body("o")
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+            local file = ngx.req.get_body_file()
+            if not file then
+                ngx.say("body file: ", file)
+                return
+            end
+
+            local f, err = io.open(file, "r")
+            if not f then
+                ngx.say("failed to open file: ", err)
+                return
+            end
+
+            local data = f:read("*a")
+            f:close()
+            ngx.say("body file: ", data)
+        ';
+    }
+--- request
+    GET /t
+--- stap2
+F(ngx_http_lua_write_request_body) {
+    b = ngx_chain_buf($body)
+    println("buf: ", b,
+        ", in-mem: ", ngx_buf_in_memory(b),
+        ", size: ", ngx_buf_size(b),
+        ", data: ", ngx_buf_data(b))
+}
+F(ngx_open_tempfile) {
+    println("open temp file ", user_string($name), ", persist: ", $persistent)
+}
+F(ngx_pool_delete_file) {
+    println("delete ", ngx_pool_cleanup_file_name($data))
+}
+--- response_body
+content length: 5
+body: nil
+body file: hello
+--- no_error_log
+[error]
+--- error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 33: init & append & finish (use default buffer size)
+--- config
+    location /t {
+        client_body_buffer_size 4;
+        content_by_lua '
+            ngx.req.init_body()
+            ngx.req.append_body("h")
+            ngx.req.append_body("ell")
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+content length: 4
+body: hell
+--- no_error_log
+[error]
+--- no_error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 34: init & append & finish (exceeding the buffer size, proxy)
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.init_body(4)
+            ngx.req.append_body("h")
+            ngx.req.append_body("ell")
+            ngx.req.append_body("o\\n")
+            ngx.req.finish_body()
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/back;
+    }
+
+    location = /back {
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request
+POST /t
+i do like the sky
+
+--- stap
+global valid = 0
+
+F(ngx_http_handler) { valid = 1  }
+
+probe syscall.unlink {
+    if (valid && pid() == target()) {
+        println(name, "(", argstr, ")")
+    }
+}
+
+--- stap_out_like chop
+^unlink\(".*?client_body_temp/\d+"\)$
+--- response_body
+hello
+--- no_error_log
+[error]
+--- error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 35: init & append & finish (just in buffer, proxy)
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.init_body(4)
+            ngx.req.append_body("h")
+            ngx.req.append_body("ell")
+            ngx.req.finish_body()
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/back;
+    }
+
+    location = /back {
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request
+POST /t
+i do like the sky
+--- response_body chop
+hell
+--- no_error_log
+[error]
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 36: init & append & finish (exceeding buffer size, discard on-disk buffer)
+--- config
+    client_header_buffer_size 100;
+    location /t {
+        client_body_buffer_size 4;
+
+        content_by_lua '
+            ngx.req.read_body()
+
+            -- ngx.say("original body: ", ngx.req.get_body_data())
+            -- ngx.say("original body file: ", ngx.req.get_body_file())
+
+            ngx.req.init_body(4)
+            ngx.req.append_body("h")
+            ngx.req.append_body("ell")
+            ngx.req.append_body("o")
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+            local file = ngx.req.get_body_file()
+            if not file then
+                ngx.say("body file: ", file)
+                return
+            end
+
+            local f, err = io.open(file, "r")
+            if not f then
+                ngx.say("failed to open file: ", err)
+                return
+            end
+
+            local data = f:read("*a")
+            f:close()
+            ngx.say("body file: ", data)
+        ';
+    }
+--- request eval
+"POST /t
+" . ("howdyworld" x 15)
+--- stap
+/*
+F(ngx_http_read_client_request_body) { T() }
+M(http-read-body-abort) { println("read body aborted: ", user_string($arg2)) }
+M(http-read-req-header-done) { println("req header: ", ngx_table_elt_key($arg2), ": ", ngx_table_elt_value($arg2)) }
+#probe syscall.open { if (isinstr(argstr, "temp")) { println(name, ": ", argstr) } }
+
+probe syscall.unlink {
+    println(name, ": ", argstr, " :", target(), " == ", pid(), ": ", execname())
+    system(sprintf("ps aux|grep %d|grep -v grep > /dev/stderr", target()))
+    system(sprintf("ps aux|grep %d|grep -v grep  > /dev/stderr", pid()))
+}
+*/
+
+global valid = 0
+
+F(ngx_http_handler) { valid = 1  }
+#F(ngx_http_free_request) { valid = 0 }
+
+probe syscall.unlink {
+    if (valid && pid() == target()) {
+        println(name, "(", argstr, ")")
+        #print_ubacktrace()
+    }
+}
+
+/*
+probe syscall.close, syscall.open, syscall.unlink {
+    if (valid && pid() == target()) {
+        print(name, "(", argstr, ")")
+        #print_ubacktrace()
+    }
+}
+
+probe syscall.close.return, syscall.open.return, syscall.unlink.return {
+    if (valid && pid() == target()) {
+        println(" = ", retstr)
+    }
+}
+*/
+--- stap_out_like chop
+^unlink\(".*?client_body_temp/\d+"\)
+unlink\(".*?client_body_temp/\d+"\)$
+--- response_body
+content length: 5
+body: nil
+body file: hello
+--- no_error_log
+[error]
+--- error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 37: ngx.req.socket + init & append & finish (requests)
+--- config
+    location = /t {
+        client_body_buffer_size 1;
+        lua_socket_buffer_size 1;
+        content_by_lua '
+            local sock,err = ngx.req.socket()
+            if not sock then
+                ngx.say("failed to get req socket: ", err)
+                return
+            end
+
+            ngx.req.init_body(100)
+
+            while true do
+                local data, err = sock:receive(1)
+                if not data then
+                    if err == "closed" then
+                        break
+                    else
+                        ngx.say("failed to read body: ", err)
+                        return
+                    end
+                end
+                ngx.req.append_body(data)
+            end
+
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+        ';
+    }
+--- request
+POST /t
+hello, my dear friend!
+--- response_body
+content length: 22
+body: hello, my dear friend!
+--- no_error_log
+[error]
+--- no_error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 38: ngx.req.socket + init & append & finish (pipelined requests, small buffer size)
+--- config
+    location = /t {
+        client_body_buffer_size 1;
+        lua_socket_buffer_size 1;
+        content_by_lua '
+            local sock,err = ngx.req.socket()
+            if not sock then
+                ngx.say("failed to get req socket: ", err)
+                return
+            end
+
+            ngx.req.init_body(100)
+
+            while true do
+                local data, err = sock:receive(1)
+                if not data then
+                    if err == "closed" then
+                        break
+                    else
+                        ngx.say("failed to read body: ", err)
+                        return
+                    end
+                end
+                ngx.req.append_body(data)
+            end
+
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+        ';
+    }
+--- pipelined_requests eval
+["POST /t
+hello, my dear friend!",
+"POST /t
+blah blah blah"]
+--- response_body eval
+["content length: 22
+body: hello, my dear friend!
+","content length: 14
+body: blah blah blah
+"]
+--- no_error_log
+[error]
+--- no_error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 39: ngx.req.socket + init & append & finish (pipelined requests, big buffer size)
+--- config
+    location = /t {
+        client_body_buffer_size 100;
+        lua_socket_buffer_size 100;
+        content_by_lua '
+            local sock,err = ngx.req.socket()
+            if not sock then
+                ngx.say("failed to get req socket: ", err)
+                return
+            end
+
+            ngx.req.init_body(100)
+
+            while true do
+                local data, err, partial = sock:receive(100)
+                if not data then
+                    if err == "closed" then
+                        ngx.req.append_body(partial)
+                        break
+                    else
+                        ngx.say("failed to read body: ", err)
+                        return
+                    end
+                end
+                ngx.req.append_body(data)
+            end
+
+            ngx.req.finish_body()
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+
+            local data = ngx.req.get_body_data()
+            ngx.say("body: ", data)
+
+        ';
+    }
+--- pipelined_requests eval
+["POST /t
+hello, my dear friend!",
+"POST /t
+blah blah blah"]
+--- response_body eval
+["content length: 22
+body: hello, my dear friend!
+","content length: 14
+body: blah blah blah
+"]
+--- no_error_log
+[error]
+--- no_error_log
+a client request body is buffered to a temporary file
+
+
+
+=== TEST 40: calling ngx.req.socket after ngx.req.init_body
+--- config
+    location = /t {
+        client_body_buffer_size 100;
+        lua_socket_buffer_size 100;
+        content_by_lua '
+            ngx.req.init_body()
+
+            local sock, err = ngx.req.socket()
+            if not sock then
+                ngx.say("failed to get req socket: ", err)
+                return
+            end
+
+            ngx.say("done")
+        ';
+    }
+--- request
+POST /t
+hello, my dear friend!
+--- response_body
+failed to get req socket: request body already exists
+--- no_error_log
+[error]
+--- no_error_log
+a client request body is buffered to a temporary file
+
diff --git a/debian/modules/nginx-lua/t/055-subreq-vars.t b/debian/modules/nginx-lua/t/055-subreq-vars.t
index 4f10cb0..07e7d05 100644
--- a/debian/modules/nginx-lua/t/055-subreq-vars.t
+++ b/debian/modules/nginx-lua/t/055-subreq-vars.t
@@ -7,7 +7,6 @@ use Test::Nginx::Socket;
 #log_level('warn');
 
 repeat_each(2);
-#repeat_each(1);
 
 plan tests => repeat_each() * (blocks() * 2 + 5);
 
@@ -36,6 +35,33 @@ __DATA__
             ngx.print(res.body)
         ';
     }
+
+--- stap2
+
+global delta = "  "
+
+F(ngx_http_finalize_request) {
+    uri = ngx_http_req_uri($r)
+    printf("finalize req %s: %d\n", uri, $rc)
+    if ($rc == 500) {
+        print_ubacktrace()
+    }
+}
+
+F(ngx_http_lua_run_thread) {
+    uri = ngx_http_req_uri($r)
+    printf("lua run thread %s\n", uri)
+}
+
+M(http-subrequest-start) {
+    r = $arg1
+    n = ngx_http_subreq_depth(r)
+    pr = ngx_http_req_parent(r)
+    printf("%sbegin %s -> %s (%d)\n", ngx_indent(n, delta),
+        ngx_http_req_uri(pr),
+        ngx_http_req_uri(r),
+        n)
+}
 --- request
 GET /lua
 --- response_body_like: 500 Internal Server Error
diff --git a/debian/modules/nginx-lua/t/056-flush.t b/debian/modules/nginx-lua/t/056-flush.t
index 81fa45a..8577056 100644
--- a/debian/modules/nginx-lua/t/056-flush.t
+++ b/debian/modules/nginx-lua/t/056-flush.t
@@ -14,10 +14,10 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => 82;
+plan tests => repeat_each() * 44;
 
 #no_diff();
-#no_long_string();
+no_long_string();
 run_tests();
 
 __DATA__
@@ -294,3 +294,99 @@ lua buffering output bufs for the HTTP 1.0 request
 lua http 1.0 buffering makes ngx.flush() a no-op
 --- timeout: 5
 
+
+
+=== TEST 13: flush wait in a user coroutine
+--- config
+    location /test {
+        content_by_lua '
+            function f()
+                ngx.say("hello, world")
+                ngx.flush(true)
+                coroutine.yield()
+                ngx.say("hiya")
+            end
+            local c = coroutine.create(f)
+            ngx.say(coroutine.resume(c))
+            ngx.say(coroutine.resume(c))
+        ';
+    }
+--- request
+GET /test
+--- stap2
+F(ngx_http_lua_wev_handler) {
+    printf("wev handler: wev:%d\n", $r->connection->write->ready)
+}
+
+global ids, cur
+
+function gen_id(k) {
+    if (ids[k]) return ids[k]
+    ids[k] = ++cur
+    return cur
+}
+
+F(ngx_http_handler) {
+    delete ids
+    cur = 0
+}
+
+/*
+F(ngx_http_lua_run_thread) {
+    id = gen_id($ctx->cur_co)
+    printf("run thread %d\n", id)
+}
+
+probe process("/usr/local/openresty-debug/luajit/lib/libluajit-5.1.so.2").function("lua_resume") {
+    id = gen_id($L)
+    printf("lua resume %d\n", id)
+}
+*/
+
+M(http-lua-user-coroutine-resume) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("resume %x in %x\n", c, p)
+}
+
+M(http-lua-entry-coroutine-yield) {
+    println("entry coroutine yield")
+}
+
+/*
+F(ngx_http_lua_coroutine_yield) {
+    printf("yield %x\n", gen_id($L))
+}
+*/
+
+M(http-lua-user-coroutine-yield) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("yield %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_atpanic) {
+    printf("lua atpanic(%d):", gen_id($L))
+    print_ubacktrace();
+}
+
+M(http-lua-user-coroutine-create) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("create %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_ngx_exec) { println("exec") }
+
+F(ngx_http_lua_ngx_exit) { println("exit") }
+
+F(ngx_http_writer) { println("http writer") }
+
+--- response_body
+hello, world
+true
+hiya
+true
+--- error_log
+lua reuse free buf memory 13 >= 5
+
diff --git a/debian/modules/nginx-lua/t/057-flush-timeout.t b/debian/modules/nginx-lua/t/057-flush-timeout.t
index 37bba92..4b7b953 100644
--- a/debian/modules/nginx-lua/t/057-flush-timeout.t
+++ b/debian/modules/nginx-lua/t/057-flush-timeout.t
@@ -13,22 +13,27 @@ BEGIN {
 
     $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
     $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'hello, world';
+    $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
 }
 
 use lib 'lib';
 use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
 
 #worker_connections(1014);
 #master_on();
 #workers(2);
 #log_level('warn');
 
-#repeat_each(2);
+repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 1);
+plan tests => repeat_each() * (blocks() * 1 + 2);
 
 #no_diff();
-#no_long_string();
+no_long_string();
 run_tests();
 
 __DATA__
@@ -49,3 +54,160 @@ GET /test
 --- error_log eval
 [qr/client timed out \(\d+: .*?timed out\)/]
 
+
+
+=== TEST 2: send timeout timer got removed in time
+--- config
+    send_timeout 1234ms;
+    location /test {
+        content_by_lua '
+            ngx.say(string.rep("blah blah blah", 10))
+            -- ngx.flush(true)
+            ngx.eof()
+            for i = 1, 20 do
+                ngx.sleep(0.1)
+            end
+        ';
+    }
+--- request
+GET /test
+--- stap
+global evtime
+
+F(ngx_http_handler) {
+    delete evtime
+}
+
+M(timer-add) {
+    if ($arg2 == 1234) {
+        printf("add timer %d\n", $arg2)
+        evtime[$arg1] = $arg2
+    }
+}
+
+M(timer-del) {
+    time = evtime[$arg1]
+    if (time == 1234) {
+        printf("del timer %d\n", time)
+    }
+}
+
+M(timer-expire) {
+    time = evtime[$arg1]
+    if (time == 1234) {
+        printf("expire timer %d\n", time)
+        #print_ubacktrace()
+    }
+}
+/*
+probe syscall.writev.return {
+    if (pid() == target()) {
+        printf("writev: %s\n", retstr)
+    }
+}
+*/
+--- stap_out
+add timer 1234
+del timer 1234
+--- ignore_response
+--- no_error_log
+[error]
+--- timeout: 3
+
+
+
+=== TEST 3: exit in user thread (entry thread is still pending on ngx.flush)
+--- config
+    send_timeout 200ms;
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.say("hello, world!")
+            ngx.flush(true)
+
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+
+/*
+F(ngx_http_finalize_request) {
+    printf("finalize request: c:%d, a:%d, cb:%d, rb:%d\n", $r->main->count,
+        $r == $r->connection->data, $r->connection->buffered, $r->buffered)
+}
+
+F(ngx_http_set_write_handler) {
+    println("set write handler")
+}
+*/
+
+F(ngx_http_lua_flush_cleanup) {
+    println("lua flush cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: ok
+lua flush cleanup
+delete timer 200
+delete thread 2
+delete thread 1
+add timer 200
+expire timer 200
+free request
+
+--- ignore_response
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/058-tcp-socket.t b/debian/modules/nginx-lua/t/058-tcp-socket.t
index f9706cf..47eba4f 100644
--- a/debian/modules/nginx-lua/t/058-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/058-tcp-socket.t
@@ -3,17 +3,17 @@
 use lib 'lib';
 use Test::Nginx::Socket;
 
-repeat_each(2);
+#repeat_each(2);
 
 plan tests => repeat_each() * 87;
 
 our $HtmlDir = html_dir;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 
 #log_level 'warn';
+log_level 'debug';
 
 #no_long_string();
 #no_diff();
@@ -26,7 +26,7 @@ __DATA__
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -67,9 +67,10 @@ __DATA__
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
+
 --- request
 GET /t
 --- response_body
@@ -94,7 +95,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 1234;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -135,7 +136,7 @@ close: nil closed
     }
 
     location /foo {
-        echo -n foo;
+        content_by_lua 'ngx.print("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -161,7 +162,7 @@ closed
     server_tokens off;
     location /t {
         #set $port 1234;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -242,6 +243,7 @@ attempt to send data on a closed socket:
             end
         ';
     }
+
 --- request
 GET /t
 --- response_body
@@ -281,8 +283,8 @@ connect: nil connection refused
 send: nil closed
 receive: nil closed
 close: nil closed
---- error_log
-connect() failed (111: Connection refused)
+--- error_log eval
+qr/connect\(\) failed \(\d+: Connection refused\)/
 
 
 
@@ -296,7 +298,7 @@ connect() failed (111: Connection refused)
     location /test {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("taobao.com", 16787)
+            local ok, err = sock:connect("google.com", 16787)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -319,7 +321,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua socket connect timed out
+lua tcp socket connect timed out
 
 
 
@@ -328,7 +330,7 @@ lua socket connect timed out
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -429,7 +431,7 @@ attempt to send data on a closed socket
 --- request
 GET /t
 --- response_body_like
-^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(110: Operation timed out\))?
+^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(\d+: Operation timed out\))?
 connected: nil
 failed to send request: closed$
 --- error_log
@@ -442,7 +444,7 @@ attempt to send data on a closed socket
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -483,7 +485,7 @@ attempt to send data on a closed socket
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -510,7 +512,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -549,7 +551,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -578,7 +580,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -627,7 +629,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -658,7 +660,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -704,7 +706,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -734,7 +736,7 @@ close: nil closed
     lua_socket_buffer_size 1;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -780,7 +782,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -809,7 +811,7 @@ close: nil closed
     lua_socket_buffer_size 1;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -850,7 +852,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -877,7 +879,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local port = ngx.var.port
@@ -917,7 +919,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -964,10 +966,17 @@ close: nil closed
     }
 --- request
     GET /test
+
+--- stap2
+M(http-lua-info) {
+    printf("tcp resume: %p\n", $coctx)
+    print_ubacktrace()
+}
+
 --- response_body
 failed to connect: connection refused
---- error_log
-connect() failed (111: Connection refused)
+--- error_log eval
+qr/connect\(\) failed \(\d+: Connection refused\)/
 
 
 
@@ -976,7 +985,7 @@ connect() failed (111: Connection refused)
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1022,7 +1031,7 @@ connect() failed (111: Connection refused)
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -1164,6 +1173,12 @@ function go(port)
         ngx.say("failed to receive a line: ", err, " [", part, "]")
     end
 end
+
+--- stap2
+M(http-lua-info) {
+    printf("tcp resume\n")
+    print_ubacktrace()
+}
 --- request
 GET /t
 --- response_body_like eval
@@ -1381,7 +1396,7 @@ close: 1 nil
 --- no_error_log
 [error]
 --- error_log eval
-["lua reuse socket upstream", "lua socket reconnect without shutting down"]
+["lua reuse socket upstream", "lua tcp socket reconnect without shutting down"]
 
 
 
@@ -1391,7 +1406,7 @@ close: 1 nil
     location /t {
         #set $port 5000;
         set $port1 $TEST_NGINX_MEMCACHED_PORT;
-        set $port2 $TEST_NGINX_CLIENT_PORT;
+        set $port2 $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock1 = ngx.socket.tcp()
@@ -1481,7 +1496,7 @@ GET /t
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1524,7 +1539,7 @@ GET /t
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -1551,7 +1566,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1610,7 +1625,7 @@ bad argument #1 to 'send' (bad data type nil found)
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1669,7 +1684,7 @@ bad argument #1 to 'send' (bad data type boolean found)
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1795,7 +1810,7 @@ subrequest: 200, OK\r
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1864,7 +1879,7 @@ close: nil closed
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -1922,7 +1937,7 @@ close: 1 nil
     server_tokens off;
     location /t {
         #set $port 5000;
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
diff --git a/debian/modules/nginx-lua/t/059-unix-socket.t b/debian/modules/nginx-lua/t/059-unix-socket.t
index 67b6a83..63ddb71 100644
--- a/debian/modules/nginx-lua/t/059-unix-socket.t
+++ b/debian/modules/nginx-lua/t/059-unix-socket.t
@@ -7,9 +7,11 @@ repeat_each(2);
 
 plan tests => blocks() * repeat_each() * 2;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
 
 no_long_string();
+#no_shuffle();
+
 run_tests();
 
 __DATA__
@@ -79,12 +81,12 @@ failed to connect: failed to parse host name "/tmp/test-nginx.sock": invalid hos
 === TEST 3: sanity
 --- http_config
     server {
-        listen unix:/tmp/test-nginx.sock;
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
         default_type 'text/plain';
 
         server_tokens off;
         location /foo {
-            echo foo;
+            content_by_lua 'ngx.say("foo")';
             more_clear_headers Date;
         }
     }
@@ -92,7 +94,7 @@ failed to connect: failed to parse host name "/tmp/test-nginx.sock": invalid hos
     location /test {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("unix:/tmp/test-nginx.sock")
+            local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/nginx-lua/t/060-lua-memcached.t b/debian/modules/nginx-lua/t/060-lua-memcached.t
index b39c5a7..588746b 100644
--- a/debian/modules/nginx-lua/t/060-lua-memcached.t
+++ b/debian/modules/nginx-lua/t/060-lua-memcached.t
@@ -10,7 +10,6 @@ plan tests => repeat_each() * (blocks() * 3 + 1);
 our $HtmlDir = html_dir;
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 
 my $pwd = `pwd`;
 chomp $pwd;
diff --git a/debian/modules/nginx-lua/t/061-lua-redis.t b/debian/modules/nginx-lua/t/061-lua-redis.t
index bf7a502..c1f2363 100644
--- a/debian/modules/nginx-lua/t/061-lua-redis.t
+++ b/debian/modules/nginx-lua/t/061-lua-redis.t
@@ -8,7 +8,6 @@ repeat_each(2);
 plan tests => repeat_each() * (blocks() * 3);
 
 $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 
 #log_level "warn";
 #worker_connections(1024);
@@ -18,7 +17,11 @@ my $pwd = `pwd`;
 chomp $pwd;
 $ENV{TEST_NGINX_PWD} ||= $pwd;
 
+our $LuaCpath = $ENV{LUA_CPATH} ||
+    '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
+
 no_long_string();
+
 run_tests();
 
 __DATA__
@@ -46,3 +49,138 @@ some_key: hello 1234
 --- no_error_log
 [error]
 
+
+
+=== TEST 2: coroutine-based pub/sub
+--- http_config eval
+qq{
+    lua_package_path '\$TEST_NGINX_PWD/t/lib/?.lua;;';
+    lua_package_cpath '$::LuaCpath';
+}
+--- config
+    location /test {
+        content_by_lua '
+            package.loaded["socket"] = ngx.socket
+            local Redis = require "Redis"
+
+            local cjson = require "cjson"
+
+            local r1 = Redis.connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+
+            local r2 = Redis.connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+
+            local loop = r2:pubsub({ subscribe = "foo" })
+            local msg, abort = loop()
+            ngx.say("msg type: ", type(msg))
+            ngx.say("abort: ", type(abort))
+
+            if msg then
+                ngx.say("msg: ", cjson.encode(msg))
+            end
+
+            for i = 1, 3 do
+                r1:publish("foo", "test " .. i)
+                msg, abort = loop()
+                if msg then
+                    ngx.say("msg: ", cjson.encode(msg))
+                end
+                ngx.say("abort: ", type(abort))
+            end
+
+            abort()
+
+            msg, abort = loop()
+            ngx.say("msg type: ", type(msg))
+        ';
+    }
+--- stap2
+global ids, cur
+
+function gen_id(k) {
+    if (ids[k]) return ids[k]
+    ids[k] = ++cur
+    return cur
+}
+
+F(ngx_http_handler) {
+    delete ids
+    cur = 0
+}
+
+/*
+probe process("/usr/local/openresty-debug/luajit/lib/libluajit-5.1.so.2").function("lua_yield") {
+    id = gen_id($L)
+    printf("raw lua yield %d\n", id)
+    #print_ubacktrace()
+}
+
+probe process("/usr/local/openresty-debug/luajit/lib/libluajit-5.1.so.2").function("lua_resume") {
+    id = gen_id($L)
+    printf("raw lua resume %d\n", id)
+}
+*/
+
+/*
+F(ngx_http_lua_run_thread) {
+    id = gen_id($ctx->cur_co)
+    printf("run thread %d\n", id)
+}
+*/
+
+M(http-lua-user-coroutine-resume) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("resume %x in %x\n", c, p)
+}
+
+M(http-lua-entry-coroutine-yield) {
+    println("entry coroutine yield")
+}
+
+F(ngx_http_lua_coroutine_yield) {
+    printf("yield %x\n", gen_id($L))
+}
+
+/*
+F(ngx_http_lua_coroutine_resume) {
+    printf("resume %x\n", gen_id($L))
+}
+*/
+
+M(http-lua-user-coroutine-yield) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("yield %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_atpanic) {
+    printf("lua atpanic(%d):", gen_id($L))
+    print_ubacktrace();
+}
+
+M(http-lua-user-coroutine-create) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("create %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_ngx_exec) { println("exec") }
+
+F(ngx_http_lua_ngx_exit) { println("exit") }
+
+--- request
+    GET /test
+--- response_body
+msg type: table
+abort: function
+msg: {"payload":1,"channel":"foo","kind":"subscribe"}
+msg: {"payload":"test 1","channel":"foo","kind":"message"}
+abort: function
+msg: {"payload":"test 2","channel":"foo","kind":"message"}
+abort: function
+msg: {"payload":"test 3","channel":"foo","kind":"message"}
+abort: function
+msg type: nil
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/nginx-lua/t/062-count.t
index cf0330b..a5dbb20 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket;
 #log_level('warn');
 no_root_location();
 
-repeat_each(2);
+#repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3);
 
@@ -35,7 +35,7 @@ __DATA__
 --- request
 GET /test
 --- response_body
-ngx: 88
+ngx: 85
 --- no_error_log
 [error]
 
@@ -56,7 +56,7 @@ ngx: 88
 --- request
 GET /test
 --- response_body
-72
+85
 --- no_error_log
 [error]
 
@@ -84,7 +84,7 @@ GET /test
 --- request
 GET /test
 --- response_body
-n = 72
+n = 85
 --- no_error_log
 [error]
 
@@ -124,7 +124,7 @@ n = 1
 --- request
 GET /test
 --- response_body
-n = 16
+n = 21
 --- no_error_log
 [error]
 
@@ -146,7 +146,7 @@ n = 16
 --- request
 GET /test
 --- response_body
-n = 9
+n = 21
 --- no_error_log
 [error]
 
@@ -173,7 +173,7 @@ n = 9
 --- request
 GET /test
 --- response_body
-n = 9
+n = 21
 --- no_error_log
 [error]
 
@@ -213,13 +213,14 @@ n = 2
 --- request
 GET /test
 --- response_body
-n = 2
+n = 3
 --- no_error_log
 [error]
 
 
 
 === TEST 10: entries under ngx._tcp_meta
+--- SKIP
 --- config
         location = /test {
             content_by_lua '
@@ -240,6 +241,7 @@ n = 10
 
 
 === TEST 11: entries under ngx._reqsock_meta
+--- SKIP
 --- config
         location = /test {
             content_by_lua '
@@ -277,7 +279,27 @@ n = 4
 --- request
 GET /test
 --- response_body
-n = 8
+n = 10
 --- no_error_log
 [error]
 
+
+
+=== TEST 13: entries under ngx. (log by lua)
+--- config
+    location = /t {
+        log_by_lua '
+            local n = 0
+            for k, v in pairs(ngx) do
+                n = n + 1
+            end
+            ngx.log(ngx.ERR, "ngx. entry count: ", n)
+        ';
+    }
+--- request
+GET /t
+--- response_body_like: 404 Not Found
+--- error_code: 404
+--- error_log
+ngx. entry count: 85
+
diff --git a/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t b/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
index e4ccce3..1774870 100644
--- a/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
@@ -17,6 +17,10 @@ BEGIN {
 
 use lib 'lib';
 use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
 
 repeat_each(2);
 
@@ -24,12 +28,12 @@ plan tests => repeat_each() * (blocks() * 4 + 10);
 
 our $HtmlDir = html_dir;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 
+log_level("debug");
 no_long_string();
-no_diff();
+#no_diff();
 run_tests();
 
 __DATA__
@@ -39,10 +43,11 @@ __DATA__
     server_tokens off;
     lua_socket_connect_timeout 100ms;
     resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 1s;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("www.taobao.com", 12345)
+            local ok, err = sock:connect("google.com", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -56,8 +61,8 @@ GET /t
 --- response_body
 failed to connect: timeout
 --- error_log
-lua socket connect timeout: 100
-lua socket connect timed out
+lua tcp socket connect timeout: 100
+lua tcp socket connect timed out
 
 
 
@@ -70,7 +75,7 @@ lua socket connect timed out
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("www.taobao.com", 12345)
+            local ok, err = sock:connect("google.com", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -84,8 +89,8 @@ GET /t
 --- response_body
 failed to connect: timeout
 --- error_log
-lua socket connect timeout: 150
-lua socket connect timed out
+lua tcp socket connect timeout: 150
+lua tcp socket connect timed out
 
 
 
@@ -98,7 +103,7 @@ lua socket connect timed out
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("www.taobao.com", 12345)
+            local ok, err = sock:connect("google.com", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -112,8 +117,8 @@ GET /t
 --- response_body
 failed to connect: timeout
 --- error_log
-lua socket connect timeout: 102
-lua socket connect timed out
+lua tcp socket connect timeout: 102
+lua tcp socket connect timed out
 
 
 
@@ -126,7 +131,7 @@ lua socket connect timed out
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("www.taobao.com", 12345)
+            local ok, err = sock:connect("google.com", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -140,8 +145,9 @@ GET /t
 --- response_body
 failed to connect: timeout
 --- error_log
-lua socket connect timeout: 102
-lua socket connect timed out
+lua tcp socket connect timeout: 102
+lua tcp socket connect timed out
+--- timeout: 5
 
 
 
@@ -154,7 +160,7 @@ lua socket connect timed out
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("www.taobao.com", 12345)
+            local ok, err = sock:connect("google.com", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -168,8 +174,8 @@ GET /t
 --- response_body
 failed to connect: timeout
 --- error_log
-lua socket connect timeout: 102
-lua socket connect timed out
+lua tcp socket connect timeout: 102
+lua tcp socket connect timed out
 
 
 
@@ -204,9 +210,9 @@ GET /t
 connected: 1
 failed to receive: timeout
 --- error_log
-lua socket read timeout: 100
-lua socket connect timeout: 60000
-lua socket read timed out
+lua tcp socket read timeout: 100
+lua tcp socket connect timeout: 60000
+lua tcp socket read timed out
 
 
 
@@ -243,9 +249,9 @@ GET /t
 connected: 1
 failed to receive: timeout
 --- error_log
-lua socket connect timeout: 60000
-lua socket read timeout: 150
-lua socket read timed out
+lua tcp socket connect timeout: 60000
+lua tcp socket read timeout: 150
+lua tcp socket read timed out
 
 
 
@@ -282,9 +288,9 @@ GET /t
 connected: 1
 failed to receive: timeout
 --- error_log
-lua socket connect timeout: 60000
-lua socket read timeout: 102
-lua socket read timed out
+lua tcp socket connect timeout: 60000
+lua tcp socket read timeout: 102
+lua tcp socket read timed out
 
 
 
@@ -322,9 +328,9 @@ GET /t
 connected: 1
 failed to receive: timeout
 --- error_log
-lua socket connect timeout: 60000
-lua socket read timeout: 102
-lua socket read timed out
+lua tcp socket connect timeout: 60000
+lua tcp socket read timeout: 102
+lua tcp socket read timed out
 
 
 
@@ -361,9 +367,9 @@ GET /t
 connected: 1
 failed to receive: timeout
 --- error_log
-lua socket read timeout: 102
-lua socket connect timeout: 60000
-lua socket read timed out
+lua tcp socket read timeout: 102
+lua tcp socket connect timeout: 60000
+lua tcp socket read timed out
 
 
 
@@ -394,13 +400,27 @@ lua socket read timed out
     }
 --- request
 GET /t
+--- stap2
+global active = 0
+F(ngx_http_lua_socket_send) {
+    active = 1
+    println(probefunc())
+}
+probe syscall.send,
+    syscall.sendto,
+    syscall.writev
+{
+    if (active && pid() == target()) {
+        println(probefunc())
+    }
+}
 --- response_body
 connected: 1
 failed to send: timeout
 --- error_log
-lua socket send timeout: 100
-lua socket connect timeout: 60000
-lua socket write timed out
+lua tcp socket send timeout: 100
+lua tcp socket connect timeout: 60000
+lua tcp socket write timed out
 
 
 
@@ -437,9 +457,9 @@ GET /t
 connected: 1
 failed to send: timeout
 --- error_log
-lua socket connect timeout: 60000
-lua socket send timeout: 150
-lua socket write timed out
+lua tcp socket connect timeout: 60000
+lua tcp socket send timeout: 150
+lua tcp socket write timed out
 
 
 
@@ -476,9 +496,9 @@ GET /t
 connected: 1
 failed to send: timeout
 --- error_log
-lua socket connect timeout: 60000
-lua socket send timeout: 102
-lua socket write timed out
+lua tcp socket connect timeout: 60000
+lua tcp socket send timeout: 102
+lua tcp socket write timed out
 
 
 
@@ -515,9 +535,9 @@ GET /t
 connected: 1
 failed to send: timeout
 --- error_log
-lua socket connect timeout: 60000
-lua socket send timeout: 102
-lua socket write timed out
+lua tcp socket connect timeout: 60000
+lua tcp socket send timeout: 102
+lua tcp socket write timed out
 
 
 
@@ -554,7 +574,101 @@ GET /t
 connected: 1
 failed to send: timeout
 --- error_log
-lua socket send timeout: 102
-lua socket connect timeout: 60000
-lua socket write timed out
+lua tcp socket send timeout: 102
+lua tcp socket connect timeout: 60000
+lua tcp socket write timed out
+
+
+
+=== TEST 16: exit in user thread (entry thread is still pending on tcpsock:send)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local bytes, ok = sock:send("get helloworld!")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
 
diff --git a/debian/modules/nginx-lua/t/066-socket-receiveuntil.t b/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
index faf206d..9d6c7c0 100644
--- a/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
@@ -9,7 +9,6 @@ plan tests => repeat_each() * (blocks() * 3);
 
 our $HtmlDir = html_dir;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
 no_long_string();
@@ -76,7 +75,7 @@ close: 1 nil
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -118,7 +117,7 @@ close: 1 nil
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -145,7 +144,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -187,7 +186,7 @@ close: nil closed
     }
 
     location /foo {
-        echo foo;
+        content_by_lua 'ngx.say("foo")';
         more_clear_headers Date;
     }
 --- request
@@ -213,7 +212,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -262,7 +261,7 @@ close: nil closed
     }
 
     location /foo {
-        echo abcabcabd;
+        content_by_lua 'ngx.say("abcabcabd")';
         more_clear_headers Date;
     }
 --- request
@@ -284,7 +283,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -333,7 +332,7 @@ close: nil closed
     }
 
     location /foo {
-        echo abcabcaad;
+        content_by_lua 'ngx.say("abcabcaad")';
         more_clear_headers Date;
     }
 --- request
@@ -355,7 +354,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -426,7 +425,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -498,7 +497,7 @@ close: nil closed
     server_tokens off;
     lua_socket_buffer_size 2;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -570,7 +569,7 @@ close: nil closed
     server_tokens off;
     lua_socket_buffer_size 1;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -641,7 +640,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -712,7 +711,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -783,7 +782,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -854,7 +853,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -925,7 +924,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -996,7 +995,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -1072,7 +1071,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         lua_socket_buffer_size 1;
 
         content_by_lua '
@@ -1149,7 +1148,7 @@ close: nil closed
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         lua_socket_buffer_size 1;
 
         content_by_lua '
@@ -1189,13 +1188,13 @@ close: nil closed
                     ngx.say("read: ", line)
 
                 else
-                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                    ngx.say("failed to read a chunk: ", err, " [", part, "]")
                 end
 
                 local data, err, part = sock:receive(1)
                 if not data then
-                    ngx.say("failed to read a line: ", err, " [", part, "]")
-                    return
+                    ngx.say("failed to read a byte: ", err, " [", part, "]")
+                    break
                 else
                     ngx.say("read one byte: ", data)
                 end
@@ -1216,18 +1215,20 @@ GET /t
 qq{connected: 1
 request sent: 57
 read: hell
-read: o, w
-read: orld
-read:  --
+read one byte: o
+read: , wo
+read one byte: r
+read: ld -
+read one byte: -
 read: 
-failed to read a line: nil [nil]
-failed to read a line: closed [
-]
+read one byte: 
+
+failed to read a chunk: nil [nil]
+failed to read a byte: closed []
 close: nil closed
 }
 --- no_error_log
 [error]
---- SKIP
 
 
 
@@ -1236,7 +1237,7 @@ close: nil closed
     server_tokens off;
     lua_socket_buffer_size 3;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             -- collectgarbage("collect")
@@ -1302,3 +1303,29 @@ close: nil closed
 [error]
 
 
+
+=== TEST 19: long patterns
+this exposed a memory leak in receiveuntil
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.req.socket()
+            if not sock then
+                ngx.say("failed to get req socket: ", err)
+                return
+            end
+            local reader, err = sock:receiveuntil("------------------------------------------- abcdefghijklmnopqrstuvwxyz")
+            if not reader then
+                ngx.say("failed to get reader: ", err)
+                return
+            end
+            ngx.say("ok")
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/067-req-socket.t b/debian/modules/nginx-lua/t/067-req-socket.t
index 91c69de..ec0d1d0 100644
--- a/debian/modules/nginx-lua/t/067-req-socket.t
+++ b/debian/modules/nginx-lua/t/067-req-socket.t
@@ -5,16 +5,16 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 3);
+plan tests => repeat_each() * (blocks() * 3 + 6);
 
 our $HtmlDir = html_dir;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 #$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
 no_long_string();
 #no_diff();
 #log_level 'warn';
+no_shuffle();
 
 run_tests();
 
@@ -521,3 +521,55 @@ Expect: 100-Continue
 --- no_error_log
 [error]
 
+
+
+=== TEST 8: pipelined requests, big buffer, small steps
+--- config
+    location /t {
+        lua_socket_buffer_size 5;
+        content_by_lua '
+            local sock, err = ngx.req.socket()
+            if sock then
+                ngx.say("got the request socket")
+            else
+                ngx.say("failed to get the request socket: ", err)
+            end
+
+            for i = 1, 6 do
+                local data, err, part = sock:receive(2)
+                if data then
+                    ngx.say("received: ", data)
+                else
+                    ngx.say("failed to receive: ", err, " [", part, "]")
+                end
+            end
+        ';
+    }
+--- stap2
+M(http-lua-req-socket-consume-preread) {
+    println("preread: ", user_string_n($arg2, $arg3))
+}
+
+--- pipelined_requests eval
+["POST /t
+hello world","POST /t
+hiya globe"]
+--- response_body eval
+["got the request socket
+received: he
+received: ll
+received: o 
+received: wo
+received: rl
+failed to receive: closed [d]
+","got the request socket
+received: hi
+received: ya
+received:  g
+received: lo
+received: be
+failed to receive: closed []
+"]
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/068-socket-keepalive.t b/debian/modules/nginx-lua/t/068-socket-keepalive.t
index 2341f8c..408fe94 100644
--- a/debian/modules/nginx-lua/t/068-socket-keepalive.t
+++ b/debian/modules/nginx-lua/t/068-socket-keepalive.t
@@ -3,22 +3,26 @@
 use lib 'lib';
 use Test::Nginx::Socket;
 
-repeat_each(2);
+#repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 5 + 8);
+plan tests => repeat_each() * (blocks() * 5 + 7);
 
 our $HtmlDir = html_dir;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-#$ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
+$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
+$ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
 
 $ENV{LUA_PATH} ||=
     '/usr/local/openresty-debug/lualib/?.lua;/usr/local/openresty/lualib/?.lua;;';
 
 no_long_string();
 #no_diff();
+
 #log_level 'warn';
+log_level 'debug';
+
+no_shuffle();
 
 run_tests();
 
@@ -75,19 +79,19 @@ function go(port)
 end
 --- request
 GET /t
---- response_body_like
-^connected: 1, reused: \d+
+--- response_body
+connected: 1, reused: 0
 request sent: 11
 received: OK
-connected: 1, reused: [1-9]\d*
+connected: 1, reused: 1
 request sent: 11
 received: OK
 --- no_error_log eval
 ["[error]",
-"lua socket keepalive: free connection pool for "]
+"lua tcp socket keepalive: free connection pool for "]
 --- error_log eval
-qq{lua socket get keepalive peer: using connection
-lua socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
+qq{lua tcp socket get keepalive peer: using connection
+lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
 }
 
 
@@ -148,18 +152,18 @@ function go(port, keepalive)
         sock:close()
     end
 end
---- response_body_like
-^connected: 1, reused: \d+
+--- response_body
+connected: 1, reused: 0
 request sent: 11
 received: OK
-connected: 1, reused: [1-9]\d*
+connected: 1, reused: 1
 request sent: 11
 received: OK
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket get keepalive peer: using connection",
-"lua socket keepalive: free connection pool for "]
+["lua tcp socket get keepalive peer: using connection",
+"lua tcp socket keepalive: free connection pool for "]
 
 
 
@@ -170,7 +174,7 @@ received: OK
    server_tokens off;
    keepalive_timeout 100ms;
    location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -232,8 +236,8 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive close handler",
-"lua socket keepalive: free connection pool for "]
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for "]
 --- timeout: 3
 
 
@@ -246,7 +250,7 @@ done
    location /t {
         keepalive_timeout 60s;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -307,8 +311,8 @@ received response of 156 bytes
 done
 --- no_error_log eval
 ["[error]",
-"lua socket keepalive close handler: fd:",
-"lua socket keepalive: free connection pool for "]
+"lua tcp socket keepalive close handler: fd:",
+"lua tcp socket keepalive: free connection pool for "]
 --- timeout: 4
 
 
@@ -320,7 +324,7 @@ done
        keepalive_timeout 60s;
        lua_socket_keepalive_timeout 100ms;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -382,10 +386,10 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive close handler",
-"lua socket keepalive: free connection pool for ",
-"lua socket keepalive timeout: 100 ms",
-qr/lua socket connection pool size: 30\b/]
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 100 ms",
+qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
 
 
@@ -398,7 +402,7 @@ qr/lua socket connection pool size: 30\b/]
        lua_socket_keepalive_timeout 100ms;
        lua_socket_pool_size 1;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -460,10 +464,10 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive close handler",
-"lua socket keepalive: free connection pool for ",
-"lua socket keepalive timeout: 100 ms",
-qr/lua socket connection pool size: 1\b/]
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 100 ms",
+qr/lua tcp socket connection pool size: 1\b/]
 --- timeout: 4
 
 
@@ -475,7 +479,7 @@ qr/lua socket connection pool size: 1\b/]
        keepalive_timeout 60s;
        lua_socket_keepalive_timeout 0;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -537,8 +541,8 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive timeout: unlimited",
-qr/lua socket connection pool size: 30\b/]
+["lua tcp socket keepalive timeout: unlimited",
+qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
 
 
@@ -550,7 +554,7 @@ qr/lua socket connection pool size: 30\b/]
         keepalive_timeout 60s;
         lua_socket_keepalive_timeout 60s;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -612,10 +616,10 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive close handler",
-"lua socket keepalive: free connection pool for ",
-"lua socket keepalive timeout: 123 ms",
-qr/lua socket connection pool size: 30\b/]
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 123 ms",
+qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
 
 
@@ -628,7 +632,7 @@ qr/lua socket connection pool size: 30\b/]
        lua_socket_keepalive_timeout 100ms;
        lua_socket_pool_size 100;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -690,10 +694,10 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive close handler",
-"lua socket keepalive: free connection pool for ",
-"lua socket keepalive timeout: 101 ms",
-qr/lua socket connection pool size: 25\b/]
+["lua tcp socket keepalive close handler",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket keepalive timeout: 101 ms",
+qr/lua tcp socket connection pool size: 25\b/]
 --- timeout: 4
 
 
@@ -705,7 +709,7 @@ qr/lua socket connection pool size: 25\b/]
        keepalive_timeout 60s;
        lua_socket_keepalive_timeout 1000ms;
 
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
         content_by_lua '
             local port = ngx.var.port
 
@@ -767,8 +771,8 @@ done
 --- no_error_log
 [error]
 --- error_log eval
-["lua socket keepalive timeout: unlimited",
-qr/lua socket connection pool size: 30\b/]
+["lua tcp socket keepalive timeout: unlimited",
+qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
 
 
@@ -778,7 +782,7 @@ qr/lua socket connection pool size: 30\b/]
 "
     lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
-        listen unix:/tmp/test-nginx.sock;
+        listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
 
         server_tokens off;
@@ -793,9 +797,10 @@ qr/lua socket connection pool size: 30\b/]
         set $port $TEST_NGINX_MEMCACHED_PORT;
         content_by_lua '
             local test = require "test"
+            local path = "$TEST_NGINX_HTML_DIR/nginx.sock";
             local port = ngx.var.port
-            test.go(port)
-            test.go(port)
+            test.go(path, port)
+            test.go(path, port)
         ';
     }
 --- request
@@ -804,9 +809,9 @@ GET /t
 >>> test.lua
 module("test", package.seeall)
 
-function go(port)
+function go(path, port)
     local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("unix:/tmp/test-nginx.sock")
+    local ok, err = sock:connect("unix:" .. path)
     if not ok then
         ngx.say("failed to connect: ", err)
         return
@@ -838,19 +843,19 @@ function go(port)
         ngx.say("failed to set reusable: ", err)
     end
 end
---- response_body_like
-^connected: 1, reused: \d+
+--- response_body
+connected: 1, reused: 0
 request sent: 61
 received response of 119 bytes
-connected: 1, reused: [1-9]\d*
+connected: 1, reused: 1
 request sent: 61
 received response of 119 bytes
 --- no_error_log eval
 ["[error]",
-"lua socket keepalive: free connection pool for "]
+"lua tcp socket keepalive: free connection pool for "]
 --- error_log eval
-["lua socket get keepalive peer: using connection",
-'lua socket keepalive create connection pool for key "unix:/tmp/test-nginx.sock"']
+["lua tcp socket get keepalive peer: using connection",
+'lua tcp socket keepalive create connection pool for key "unix:']
 
 
 
@@ -894,7 +899,7 @@ ngx.say("ok")
 --- response_body
 ok
 --- error_log
-lua socket get keepalive peer: using connection
+lua tcp socket get keepalive peer: using connection
 --- no_error_log
 [error]
 [alert]
@@ -958,3 +963,515 @@ Not found, dear...
 --- no_error_log
 [error]
 
+
+
+=== TEST 14: custom pools (different pool for the same host:port) - tcp
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go(port, "A")
+            test.go(port, "B")
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket get keepalive peer: using connection"
+]
+--- error_log
+lua tcp socket keepalive create connection pool for key "A"
+lua tcp socket keepalive create connection pool for key "B"
+
+
+
+=== TEST 15: custom pools (same pool for different host:port) - tcp
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go($TEST_NGINX_MEMCACHED_PORT, "foo")
+            test.go($TEST_NGINX_SERVER_PORT, "foo")
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 1
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+]
+--- error_log
+lua tcp socket keepalive create connection pool for key "foo"
+lua tcp socket get keepalive peer: using connection
+
+
+
+=== TEST 16: custom pools (different pool for the same host:port) - unix
+--- http_config eval
+"
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    server {
+        listen unix:$::HtmlDir/nginx.sock;
+        default_type 'text/plain';
+
+        server_tokens off;
+        location /foo {
+            echo foo;
+            more_clear_headers Date;
+        }
+    }
+"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local path = "$TEST_NGINX_HTML_DIR/nginx.sock";
+            test.go(path, "A")
+            test.go(path, "B")
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(path, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("unix:" .. path, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket get keepalive peer: using connection"
+]
+--- error_log
+lua tcp socket keepalive create connection pool for key "A"
+lua tcp socket keepalive create connection pool for key "B"
+
+
+
+=== TEST 17: custom pools (same pool for the same path) - unix
+--- http_config eval
+"
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    server {
+        listen unix:$::HtmlDir/nginx.sock;
+        default_type 'text/plain';
+
+        server_tokens off;
+    }
+"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local path = "$TEST_NGINX_HTML_DIR/nginx.sock";
+            test.go(path, "A")
+            test.go(path, "A")
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(path, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("unix:" .. path, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 1
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+]
+--- error_log
+lua tcp socket keepalive create connection pool for key "A"
+lua tcp socket get keepalive peer: using connection
+
+
+
+=== TEST 18: numeric pool option value
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go($TEST_NGINX_MEMCACHED_PORT, 3.14)
+            test.go($TEST_NGINX_SERVER_PORT, 3.14)
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 1
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+]
+--- error_log
+lua tcp socket keepalive create connection pool for key "3.14"
+lua tcp socket get keepalive peer: using connection
+
+
+
+=== TEST 19: nil pool option value
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go($TEST_NGINX_MEMCACHED_PORT, nil)
+            test.go($TEST_NGINX_SERVER_PORT, nil)
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #3 to 'connect' (bad "pool" option type: nil)
+
+
+
+=== TEST 20: (bad) table pool option value
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go($TEST_NGINX_MEMCACHED_PORT, {})
+            test.go($TEST_NGINX_SERVER_PORT, {})
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #3 to 'connect' (bad "pool" option type: table)
+
+
+
+=== TEST 21: (bad) boolean pool option value
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go($TEST_NGINX_MEMCACHED_PORT, true)
+            test.go($TEST_NGINX_SERVER_PORT, false)
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port, pool)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port, {pool = pool})
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+end
+--- request
+GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #3 to 'connect' (bad "pool" option type: boolean)
+
+
+
+=== TEST 22: clear the redis store
+--- config
+    location /t {
+        redis2_query flushall;
+        redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- request
+    GET /t
+--- response_body eval
+"+OK\r\n"
+--- no_error_log
+[error]
+[alert]
+[warn]
+
+
+
+=== TEST 23: bug in send(): clear the chain writer ctx
+--- http_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+--- config
+    location /t {
+        set $port $TEST_NGINX_REDIS_PORT;
+        content_by_lua '
+            local test = require "test"
+            local port = ngx.var.port
+            test.go(port)
+        ';
+    }
+--- user_files
+>>> test.lua
+module("test", package.seeall)
+
+function go(port)
+    local sock = ngx.socket.tcp()
+    local ok, err = sock:connect("127.0.0.1", port)
+    if not ok then
+        ngx.say("failed to connect: ", err)
+        return
+    end
+
+    local bytes, err = sock:send({})
+    if err then
+        ngx.say("failed to send empty request: ", err)
+        return
+    end
+
+    local req = "*2\r\n$3\r\nget\r\n$3\r\ndog\r\n"
+
+    local bytes, err = sock:send(req)
+    if not bytes then
+        ngx.say("failed to send request: ", err)
+        return
+    end
+
+    local line, err, part = sock:receive()
+    if line then
+        ngx.say("received: ", line)
+
+    else
+        ngx.say("failed to receive a line: ", err, " [", part, "]")
+    end
+
+    local ok, err = sock:setkeepalive()
+    if not ok then
+        ngx.say("failed to set reusable: ", err)
+    end
+
+    ngx.say("done")
+end
+--- request
+GET /t
+--- stap2
+global active
+M(http-lua-socket-tcp-send-start) {
+    active = 1
+    printf("send [%s] %d\n", text_str(user_string_n($arg3, $arg4)), $arg4)
+}
+M(http-lua-socket-tcp-receive-done) {
+    printf("receive [%s]\n", text_str(user_string_n($arg3, $arg4)))
+}
+F(ngx_output_chain) {
+    #printf("ctx->in: %s\n", ngx_chain_dump($ctx->in))
+    #printf("ctx->busy: %s\n", ngx_chain_dump($ctx->busy))
+    printf("output chain: %s\n", ngx_chain_dump($in))
+}
+F(ngx_linux_sendfile_chain) {
+    printf("linux sendfile chain: %s\n", ngx_chain_dump($in))
+}
+F(ngx_chain_writer) {
+    printf("chain writer ctx out: %p\n", $data)
+    printf("nginx chain writer: %s\n", ngx_chain_dump($in))
+}
+F(ngx_http_lua_socket_tcp_setkeepalive) {
+    delete active
+}
+M(http-lua-socket-tcp-setkeepalive-buf-unread) {
+    printf("setkeepalive unread: [%s]\n", text_str(user_string_n($arg3, $arg4)))
+}
+probe syscall.recvfrom {
+    if (active && pid() == target()) {
+        printf("recvfrom(%s)", argstr)
+    }
+}
+probe syscall.recvfrom.return {
+    if (active && pid() == target()) {
+        printf(" = %s, data [%s]\n", retstr, text_str(user_string_n($ubuf, $size)))
+    }
+}
+probe syscall.writev {
+    if (active && pid() == target()) {
+        printf("writev(%s)", ngx_iovec_dump($vec, $vlen))
+        /*
+        for (i = 0; i < $vlen; i++) {
+            printf(" %p [%s]", $vec[i]->iov_base, text_str(user_string_n($vec[i]->iov_base, $vec[i]->iov_len)))
+        }
+        */
+    }
+}
+probe syscall.writev.return {
+    if (active && pid() == target()) {
+        printf(" = %s\n", retstr)
+    }
+}
+--- response_body
+received: $-1
+done
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/069-null.t b/debian/modules/nginx-lua/t/069-null.t
index fecffb8..b50b438 100644
--- a/debian/modules/nginx-lua/t/069-null.t
+++ b/debian/modules/nginx-lua/t/069-null.t
@@ -16,7 +16,7 @@ plan tests => repeat_each() * (blocks() * 3 + 1);
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
-$ENV{LUA_CPATH} ||=
+our $LuaCpath = $ENV{LUA_CPATH} ||
     '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
 
 no_long_string();
@@ -26,6 +26,8 @@ run_tests();
 __DATA__
 
 === TEST 1: compare ngx.null with cjson.null
+--- http_config eval
+    "lua_package_cpath '$::LuaCpath';";
 --- config
     location /lua {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/071-idle-socket.t b/debian/modules/nginx-lua/t/071-idle-socket.t
index 033af95..db9fde1 100644
--- a/debian/modules/nginx-lua/t/071-idle-socket.t
+++ b/debian/modules/nginx-lua/t/071-idle-socket.t
@@ -9,7 +9,6 @@ plan tests => repeat_each() * (blocks() * 3);
 
 our $HtmlDir = html_dir;
 
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
 no_long_string();
@@ -24,7 +23,7 @@ __DATA__
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -304,7 +303,7 @@ close: 1 nil
 --- config
     server_tokens off;
     location /t {
-        set $port $TEST_NGINX_CLIENT_PORT;
+        set $port $TEST_NGINX_SERVER_PORT;
 
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -359,17 +358,17 @@ close: 1 nil
     }
 --- request
 GET /t
---- response_body eval
-qq{connected: 1
+--- response_body_like eval
+qr{connected: 1
 request sent: 57
-read: HTTP/1.1 200 OK\r
+read: HTTP/1\.1 200 OK\r
 Server: nginx\r
 Content-Type: text/plain\r
 Transfer-Encoding: chunked\r
 Connection: close\r
 \r
 6\r
-failed to set keepalive: connection in dubious state
+failed to set keepalive: (?:unread data in buffer|connection in dubious state)
 }
 --- no_error_log
 [error]
diff --git a/debian/modules/nginx-lua/t/072-conditional-get.t b/debian/modules/nginx-lua/t/072-conditional-get.t
index e6867da..285fe14 100644
--- a/debian/modules/nginx-lua/t/072-conditional-get.t
+++ b/debian/modules/nginx-lua/t/072-conditional-get.t
@@ -1,6 +1,10 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 use lib 'lib';
 use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
 
 #worker_connections(1014);
 #master_on();
@@ -8,9 +12,8 @@ use Test::Nginx::Socket;
 #log_level('warn');
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 3);
+plan tests => repeat_each() * (blocks() * 3 + 1);
 
 #no_diff();
 #no_long_string();
@@ -70,6 +73,13 @@ If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
 GET /lua
 --- more_headers
 If-Unmodified-Since: Thu, 10 May 2012 07:50:47 GMT
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: fail
+delete thread 1
+
 --- response_body_like: 412 Precondition Failed
 --- error_code: 412
 --- error_log
diff --git a/debian/modules/nginx-lua/t/073-backtrace.t b/debian/modules/nginx-lua/t/073-backtrace.t
index 5610bab..2665657 100644
--- a/debian/modules/nginx-lua/t/073-backtrace.t
+++ b/debian/modules/nginx-lua/t/073-backtrace.t
@@ -10,7 +10,7 @@ use Test::Nginx::Socket;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * 4;
+plan tests => repeat_each() * 10;
 
 #no_diff();
 #no_long_string();
@@ -18,7 +18,7 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: basic print
+=== TEST 1: sanity
 --- config
     location /lua {
         content_by_lua
@@ -40,3 +40,29 @@ attempt to call global 'lua_concat'
 :5: in function 'foo'
 :7: in function
 
+
+
+=== TEST 2: error(nil)
+--- config
+    location /lua {
+        content_by_lua
+        '   function bar()
+                error(nil)
+            end
+            function foo()
+                bar()
+            end
+            foo()
+        ';
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+lua entry thread aborted: runtime error: unknown reason
+stack traceback:
+ in function 'error'
+: in function 'bar'
+:5: in function 'foo'
+:7: in function <[string "content_by_lua"]:1>
+
diff --git a/debian/modules/nginx-lua/t/075-logby.t b/debian/modules/nginx-lua/t/075-logby.t
new file mode 100644
index 0000000..a4d22b7
--- /dev/null
+++ b/debian/modules/nginx-lua/t/075-logby.t
@@ -0,0 +1,520 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 8);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: log_by_lua
+--- config
+    location /lua {
+        echo hello;
+        log_by_lua 'ngx.log(ngx.ERR, "Hello from log_by_lua: ", ngx.var.uri)';
+    }
+--- request
+GET /lua
+--- response_body
+hello
+--- error_log
+Hello from log_by_lua: /lua
+
+
+
+=== TEST 2: log_by_lua_file
+--- config
+    location /lua {
+        echo hello;
+        log_by_lua_file html/a.lua;
+    }
+--- user_files
+>>> a.lua
+ngx.log(ngx.ERR, "Hello from log_by_lua: ", ngx.var.uri)
+--- request
+GET /lua
+--- response_body
+hello
+--- error_log
+Hello from log_by_lua: /lua
+
+
+
+=== TEST 3: log_by_lua_file & content_by_lua
+--- config
+    location /lua {
+        set $counter 3;
+        content_by_lua 'ngx.var.counter = ngx.var.counter + 1 ngx.say(ngx.var.counter)';
+        log_by_lua_file html/a.lua;
+    }
+--- user_files
+>>> a.lua
+ngx.log(ngx.ERR, "Hello from log_by_lua: ", ngx.var.counter * 2)
+--- request
+GET /lua
+--- response_body
+4
+--- error_log
+Hello from log_by_lua: 8
+
+
+
+=== TEST 4: ngx.ctx available in log_by_lua (already defined)
+--- config
+    location /lua {
+        content_by_lua 'ngx.ctx.counter = 3 ngx.say(ngx.ctx.counter)';
+        log_by_lua 'ngx.log(ngx.ERR, "ngx.ctx.counter: ", ngx.ctx.counter)';
+    }
+--- request
+GET /lua
+--- response_body
+3
+--- error_log
+ngx.ctx.counter: 3
+lua release ngx.ctx
+
+
+
+=== TEST 5: ngx.ctx available in log_by_lua (not defined yet)
+--- config
+    location /lua {
+        echo hello;
+        log_by_lua '
+            ngx.log(ngx.ERR, "ngx.ctx.counter: ", ngx.ctx.counter)
+            ngx.ctx.counter = "hello world"
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+hello
+--- error_log
+ngx.ctx.counter: nil
+lua release ngx.ctx
+
+
+
+=== TEST 6: log_by_lua + shared dict
+--- http_config
+    lua_shared_dict foo 100k;
+--- config
+    location /lua {
+        echo hello;
+        log_by_lua '
+            local foo = ngx.shared.foo
+            local key = ngx.var.uri .. ngx.status
+            local newval, err = foo:incr(key, 1)
+            if not newval then
+                if err == "not found" then
+                    foo:add(key, 0)
+                    newval, err = foo:incr(key, 1)
+                    if not newval then
+                        ngx.log(ngx.ERR, "failed to incr ", key, ": ", err)
+                        return
+                    end
+                else
+                    ngx.log(ngx.ERR, "failed to incr ", key, ": ", err)
+                    return
+                end
+            end
+            print(key, ": ", foo:get(key))
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+hello
+--- error_log eval
+qr{/lua200: [12]}
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: ngx.ctx used in different locations and different ctx (1)
+--- config
+    location /t {
+        echo hello;
+        log_by_lua '
+            ngx.log(ngx.ERR, "ngx.ctx.counter: ", ngx.ctx.counter)
+        ';
+    }
+
+    location /t2 {
+        content_by_lua '
+            ngx.ctx.counter = 32
+            ngx.say("hello")
+        ';
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+ngx.ctx.counter: nil
+lua release ngx.ctx
+
+
+
+=== TEST 8: ngx.ctx used in different locations and different ctx (2)
+--- config
+    location /t {
+        echo hello;
+        log_by_lua '
+            ngx.log(ngx.ERR, "ngx.ctx.counter: ", ngx.ctx.counter)
+        ';
+    }
+
+    location /t2 {
+        content_by_lua '
+            ngx.ctx.counter = 32
+            ngx.say(ngx.ctx.counter)
+        ';
+    }
+--- request
+GET /t2
+--- response_body
+32
+--- error_log
+lua release ngx.ctx
+
+
+
+=== TEST 9: lua error (string)
+--- config
+    location /lua {
+        log_by_lua 'error("Bad")';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+failed to run log_by_lua*: [string "log_by_lua"]:1: Bad
+
+
+
+=== TEST 10: lua error (nil)
+--- config
+    location /lua {
+        log_by_lua 'error(nil)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+failed to run log_by_lua*: unknown reason
+
+
+
+=== TEST 11: globals get cleared for every single request
+--- config
+    location /lua {
+        echo ok;
+        log_by_lua '
+            if not foo then
+                foo = 1
+            else
+                foo = foo + 1
+            end
+            ngx.log(ngx.WARN, "foo = ", foo)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+foo = 1
+
+
+
+=== TEST 12: no ngx.print
+--- config
+    location /lua {
+        log_by_lua "ngx.print(32) return 1";
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 13: no ngx.say
+--- config
+    location /lua {
+        log_by_lua "ngx.say(32) return 1";
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 14: no ngx.flush
+--- config
+    location /lua {
+        log_by_lua "ngx.flush()";
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 15: no ngx.eof
+--- config
+    location /lua {
+        log_by_lua "ngx.eof()";
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 16: no ngx.send_headers
+--- config
+    location /lua {
+        log_by_lua "ngx.send_headers()";
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 17: no ngx.location.capture
+--- config
+    location /lua {
+        log_by_lua 'ngx.location.capture("/sub")';
+        echo ok;
+    }
+
+    location /sub {
+        echo sub;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 18: no ngx.location.capture_multi
+--- config
+    location /lua {
+        log_by_lua 'ngx.location.capture_multi{{"/sub"}}';
+        echo ok;
+    }
+
+    location /sub {
+        echo sub;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 19: no ngx.exit
+--- config
+    location /lua {
+        log_by_lua 'ngx.exit(0)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 20: no ngx.redirect
+--- config
+    location /lua {
+        log_by_lua 'ngx.redirect("/blah")';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 21: no ngx.exec
+--- config
+    location /lua {
+        log_by_lua 'ngx.exec("/blah")';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 22: no ngx.req.set_uri(uri, true)
+--- config
+    location /lua {
+        log_by_lua 'ngx.req.set_uri("/blah", true)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 23: ngx.req.set_uri(uri) exists
+--- config
+    location /lua {
+        log_by_lua 'ngx.req.set_uri("/blah") print("log_by_lua: uri: ", ngx.var.uri)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+log_by_lua: uri: /blah
+
+
+
+=== TEST 24: no ngx.req.read_body()
+--- config
+    location /lua {
+        log_by_lua 'ngx.req.read_body()';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 25: no ngx.req.socket()
+--- config
+    location /lua {
+        log_by_lua 'return ngx.req.socket()';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 26: no ngx.socket.tcp()
+--- config
+    location /lua {
+        log_by_lua 'return ngx.socket.tcp()';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 27: no ngx.socket.connect()
+--- config
+    location /lua {
+        log_by_lua 'return ngx.socket.connect("127.0.0.1", 80)';
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+API disabled in the context of log_by_lua*
+
+
+
+=== TEST 28: backtrace
+--- config
+    location /t {
+        echo ok;
+        log_by_lua '
+            function foo()
+                bar()
+            end
+
+            function bar()
+                error("something bad happened")
+            end
+
+            foo()
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+ok
+--- error_log
+something bad happened
+stack traceback:
+in function 'error'
+in function 'bar'
+in function 'foo'
+
diff --git a/debian/modules/nginx-lua/t/077-sleep.t b/debian/modules/nginx-lua/t/077-sleep.t
new file mode 100644
index 0000000..a3b13bc
--- /dev/null
+++ b/debian/modules/nginx-lua/t/077-sleep.t
@@ -0,0 +1,214 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * 34;
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sleep 0.5 - content
+--- config
+    location /test {
+        content_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.sleep(0.5)
+            local now = ngx.now()
+            ngx.say(now - before)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:4[5-9]\d*|5[0-5]\d*|5)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+lua sleep timer expired: "/test?"
+
+
+
+=== TEST 2: sleep a - content
+--- config
+    location /test {
+        content_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.sleep("a")
+            local now = ngx.now()
+            ngx.say(now - before)
+        ';
+    }
+--- request
+GET /test
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+--- error_log
+bad argument #1 to 'sleep'
+
+
+
+=== TEST 3: sleep 0.5 in subrequest - content
+--- config
+    location /test {
+        content_by_lua '
+            ngx.update_time()
+            local before = ngx.now()
+            ngx.location.capture("/sleep")
+            local now = ngx.now()
+            local delay = now - before
+            ngx.say(delay)
+        ';
+    }
+    location /sleep {
+        content_by_lua 'ngx.sleep(0.5)';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^0\.(?:4[5-9]\d*|5[0-9]\d*|5)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/sleep?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: sleep a in subrequest with bad argument
+--- config
+    location /test {
+        content_by_lua '
+            local res = ngx.location.capture("/sleep");
+        ';
+    }
+    location /sleep {
+        content_by_lua 'ngx.sleep("a")';
+    }
+--- request
+GET /test
+--- response_body_like:
+--- error_log
+bad argument #1 to 'sleep'
+
+
+
+=== TEST 5: sleep 0.33 - multi-times in content
+--- config
+    location /test {
+        content_by_lua '
+            ngx.update_time()
+            local start = ngx.now()
+            ngx.sleep(0.33)
+            ngx.sleep(0.33)
+            ngx.sleep(0.33)
+            ngx.say(ngx.now() - start)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like chop
+^(?:0\.9\d*|1\.[0-2]\d*|1)$
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: sleep 0.5 - interleaved by ngx.say() - ended by ngx.sleep
+--- config
+    location /test {
+        content_by_lua '
+            ngx.send_headers()
+            -- ngx.location.capture("/sleep")
+            ngx.sleep(1)
+            ngx.say("blah")
+            ngx.sleep(1)
+            -- ngx.location.capture("/sleep")
+        ';
+    }
+    location = /sleep {
+        echo_sleep 0.1;
+    }
+--- request
+GET /test
+--- response_body
+blah
+--- error_log
+lua ready to sleep
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: sleep 0.5 - interleaved by ngx.say() - not ended by ngx.sleep
+--- config
+    location /test {
+        content_by_lua '
+            ngx.send_headers()
+            -- ngx.location.capture("/sleep")
+            ngx.sleep(0.3)
+            ngx.say("blah")
+            ngx.sleep(0.5)
+            -- ngx.location.capture("/sleep")
+            ngx.say("hiya")
+        ';
+    }
+    location = /sleep {
+        echo_sleep 0.1;
+    }
+--- request
+GET /test
+--- response_body
+blah
+hiya
+--- error_log
+lua ready to sleep for
+lua sleep timer expired: "/test?"
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: ngx.location.capture before and after ngx.sleep
+--- config
+    location /test {
+        content_by_lua '
+            local res = ngx.location.capture("/sub")
+            ngx.print(res.body)
+
+            ngx.sleep(0.1)
+
+            res = ngx.location.capture("/sub")
+            ngx.print(res.body)
+        ';
+    }
+    location = /hello {
+        echo hello world;
+    }
+    location = /sub {
+        proxy_pass http://127.0.0.1:$server_port/hello;
+    }
+--- request
+GET /test
+--- response_body
+hello world
+hello world
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/078-hup-vars.t b/debian/modules/nginx-lua/t/078-hup-vars.t
new file mode 100644
index 0000000..e9ab8cd
--- /dev/null
+++ b/debian/modules/nginx-lua/t/078-hup-vars.t
@@ -0,0 +1,65 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+our $SkipReason;
+
+BEGIN {
+    if ($ENV{TEST_NGINX_CHECK_LEAK}) {
+        $SkipReason = "unavailable for the hup tests";
+
+    } else {
+        $ENV{TEST_NGINX_USE_HUP} = 1;
+    }
+}
+
+use lib 'lib';
+use Test::Nginx::Socket $SkipReason ? (skip_all => $SkipReason) : ();
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks());
+
+#no_diff();
+#no_long_string();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: nginx variable hup bug (step 1)
+http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002223.html
+--- config
+    location /t {
+        set $vv $http_host;
+        set_by_lua $i 'return ngx.var.http_host';
+        echo $i;
+    }
+--- request
+GET /t
+--- response_body
+localhost
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: nginx variable hup bug (step 2)
+http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002223.html
+--- config
+    location /t {
+        #set $vv $http_host;
+        set_by_lua $i 'return ngx.var.http_host';
+        echo $i;
+    }
+--- request
+GET /t
+--- response_body
+localhost
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/079-unused-directives.t b/debian/modules/nginx-lua/t/079-unused-directives.t
new file mode 100644
index 0000000..1fc6d9d
--- /dev/null
+++ b/debian/modules/nginx-lua/t/079-unused-directives.t
@@ -0,0 +1,262 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (11 * blocks());
+
+#no_diff();
+#no_long_string();
+#no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: rewrite_by_lua unused
+--- config
+    location /t {
+        set_by_lua $i 'return 32';
+        #rewrite_by_lua return;
+        echo $i;
+    }
+--- request
+GET /t
+--- response_body
+32
+--- no_error_log
+lua capture header filter, uri "/t"
+lua capture body filter, uri "/t"
+lua rewrite handler, uri "/t"
+lua access handler, uri "/t"
+lua content handler, uri "/t"
+lua header filter for user lua code, uri "/t"
+lua body filter for user lua code, uri "/t"
+lua log handler, uri "/t"
+[error]
+
+
+
+=== TEST 2: rewrite_by_lua used
+--- config
+    location /t {
+        rewrite_by_lua return;
+        echo hello;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua rewrite handler, uri "/t"
+lua capture header filter, uri "/t"
+lua capture body filter, uri "/t"
+--- no_error_log
+lua access handler, uri "/t"
+lua content handler, uri "/t"
+lua header filter for user lua code, uri "/t"
+lua body filter for user lua code, uri "/t"
+lua log handler, uri "/t"
+[error]
+
+
+
+=== TEST 3: access_by_lua used
+--- config
+    location /t {
+        access_by_lua return;
+        echo hello;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua access handler, uri "/t"
+lua capture body filter, uri "/t"
+lua capture header filter, uri "/t"
+--- no_error_log
+lua rewrite handler, uri "/t"
+lua content handler, uri "/t"
+lua header filter for user lua code, uri "/t"
+lua body filter for user lua code, uri "/t"
+lua log handler, uri "/t"
+[error]
+
+
+
+=== TEST 4: content_by_lua used
+--- config
+    location /t {
+        content_by_lua 'ngx.say("hello")';
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua content handler, uri "/t"
+lua capture body filter, uri "/t"
+lua capture header filter, uri "/t"
+--- no_error_log
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua header filter for user lua code, uri "/t"
+lua body filter for user lua code, uri "/t"
+lua log handler, uri "/t"
+[error]
+
+
+
+=== TEST 5: header_filter_by_lua
+--- config
+    location /t {
+        echo hello;
+        header_filter_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua header filter for user lua code, uri "/t"
+--- no_error_log
+lua capture header filter, uri "/t"
+lua content handler, uri "/t"
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua capture body filter, uri "/t"
+lua log handler, uri "/t"
+lua body filter for user lua code, uri "/t"
+[error]
+
+
+
+=== TEST 6: log_by_lua
+--- config
+    location /t {
+        echo hello;
+        log_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua log handler, uri "/t"
+--- no_error_log
+lua header filter for user lua code, uri "/t"
+lua capture header filter, uri "/t"
+lua content handler, uri "/t"
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua capture body filter, uri "/t"
+lua body filter for user lua code, uri "/t"
+[error]
+
+
+
+=== TEST 7: body_filter_by_lua
+--- config
+    location /t {
+        echo hello;
+        body_filter_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua header filter for user lua code, uri "/t"
+lua body filter for user lua code, uri "/t"
+--- no_error_log
+lua capture header filter, uri "/t"
+lua content handler, uri "/t"
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua capture body filter, uri "/t"
+lua log handler, uri "/t"
+[error]
+
+
+
+=== TEST 8: header_filter_by_lua_file
+--- config
+    location /t {
+        echo hello;
+        header_filter_by_lua_file html/a.lua;
+    }
+--- user_files
+>>> a.lua
+return
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua header filter for user lua code, uri "/t"
+--- no_error_log
+lua capture header filter, uri "/t"
+lua content handler, uri "/t"
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua capture body filter, uri "/t"
+lua log handler, uri "/t"
+lua body filter for user lua code, uri "/t"
+[error]
+
+
+
+=== TEST 9: log_by_lua
+--- config
+    location /t {
+        echo hello;
+        log_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua log handler, uri "/t"
+--- no_error_log
+lua header filter for user lua code, uri "/t"
+lua capture header filter, uri "/t"
+lua content handler, uri "/t"
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua capture body filter, uri "/t"
+lua body filter for user lua code, uri "/t"
+[error]
+
+
+
+=== TEST 10: body_filter_by_lua
+--- config
+    location /t {
+        echo hello;
+        body_filter_by_lua return;
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+lua header filter for user lua code, uri "/t"
+lua body filter for user lua code, uri "/t"
+--- no_error_log
+lua capture header filter, uri "/t"
+lua content handler, uri "/t"
+lua access handler, uri "/t"
+lua rewrite handler, uri "/t"
+lua capture body filter, uri "/t"
+lua log handler, uri "/t"
+[error]
+
diff --git a/debian/modules/nginx-lua/t/080-hup-shdict.t b/debian/modules/nginx-lua/t/080-hup-shdict.t
new file mode 100644
index 0000000..a94e096
--- /dev/null
+++ b/debian/modules/nginx-lua/t/080-hup-shdict.t
@@ -0,0 +1,85 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+our $SkipReason;
+
+BEGIN {
+    if ($ENV{TEST_NGINX_CHECK_LEAK}) {
+        $SkipReason = "unavailable for the hup tests";
+
+    } else {
+        $ENV{TEST_NGINX_USE_HUP} = 1;
+    }
+}
+
+use lib 'lib';
+use Test::Nginx::Socket $SkipReason ? (skip_all => $SkipReason) : ();
+
+#worker_connections(1014);
+#master_process_enabled(1);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+no_long_string();
+#master_on();
+#workers(2);
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: initialize the fields in shdict
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", 32)
+            dogs:set("bah", 10502)
+            local val = dogs:get("foo")
+            ngx.say(val, " ", type(val))
+            val = dogs:get("bah")
+            ngx.say(val, " ", type(val))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+32 number
+10502 number
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: retrieve the fields in shdict after HUP reload
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+
+            -- dogs:set("foo", 32)
+            -- dogs:set("bah", 10502)
+
+            local val = dogs:get("foo")
+            ngx.say(val, " ", type(val))
+            val = dogs:get("bah")
+            ngx.say(val, " ", type(val))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+32 number
+10502 number
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/081-bytecode.t b/debian/modules/nginx-lua/t/081-bytecode.t
new file mode 100644
index 0000000..f67e117
--- /dev/null
+++ b/debian/modules/nginx-lua/t/081-bytecode.t
@@ -0,0 +1,229 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 2 + 2);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: bytecode ("ngx.say('hello');")
+--- config
+    root html;
+    location /save_call {
+        content_by_lua '
+            ngx.req.read_body();
+            local b = ngx.req.get_body_data();
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
+            if package.loaded["jit"] then
+                f:write(string.sub(b, 149));
+            else
+                f:write(string.sub(b, 1, 147));
+            end
+            f:close(); res = ngx.location.capture("/call");
+            ngx.print(res.body)
+        ';
+    }
+    location /call {
+        content_by_lua_file $realpath_root/test.lua;
+    }
+--- request eval
+"POST /save_call
+\x1b\x4c\x75\x61\x51\x00\x01\x04\x08\x04\x08\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x40\x74\x65\x73\x74\x2e\x6c\x75\x61\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02\x05\x00\x00\x00\x05\x00\x00\x00\x06\x40\x40\x00\x41\x80\x00\x00\x1c\x40\x00\x01\x1e\x00\x80\x00\x03\x00\x00\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x6e\x67\x78\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x73\x61\x79\x00\x04\x06\x00\x00\x00\x00\x00\x00\x00\x68\x65\x6c\x6c\x6f\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x1b\x4c\x4a\x01\x02\x29\x02\x00\x02\x00\x03\x00\x05\x34\x00\x00\x00\x37\x00\x01\x00\x25\x01\x02\x00\x3e\x00\x02\x01\x47\x00\x01\x00\x0a\x68\x65\x6c\x6c\x6f\x08\x73\x61\x79\x08\x6e\x67\x78\x00"
+--- response_body
+hello
+
+
+
+=== TEST 2: luajit load lua bytecode or lua load luajit bytecode
+--- config
+    root html;
+    location /save_call {
+        content_by_lua '
+            ngx.req.read_body();
+            local b = ngx.req.get_body_data();
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
+            if not package.loaded["jit"] then
+                f:write(string.sub(b, 149));
+            else
+                f:write(string.sub(b, 1, 147));
+            end
+            f:close(); res = ngx.location.capture("/call");
+            if res.status == 200 then
+                ngx.print(res.body)
+            else
+                ngx.say("error")
+            end
+        ';
+    }
+    location /call {
+        content_by_lua_file $realpath_root/test.lua;
+    }
+--- request eval
+"POST /save_call
+\x1b\x4c\x75\x61\x51\x00\x01\x04\x08\x04\x08\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x40\x74\x65\x73\x74\x2e\x6c\x75\x61\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02\x05\x00\x00\x00\x05\x00\x00\x00\x06\x40\x40\x00\x41\x80\x00\x00\x1c\x40\x00\x01\x1e\x00\x80\x00\x03\x00\x00\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x6e\x67\x78\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x73\x61\x79\x00\x04\x06\x00\x00\x00\x00\x00\x00\x00\x68\x65\x6c\x6c\x6f\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x1b\x4c\x4a\x01\x02\x29\x02\x00\x02\x00\x03\x00\x05\x34\x00\x00\x00\x37\x00\x01\x00\x25\x01\x02\x00\x3e\x00\x02\x01\x47\x00\x01\x00\x0a\x68\x65\x6c\x6c\x6f\x08\x73\x61\x79\x08\x6e\x67\x78\x00"
+--- response_body
+error
+--- error_log
+failed to load Lua inlined code: bad byte-code header in
+
+
+
+=== TEST 3: unknown bytecode version
+--- config
+    root html;
+    location /save_call {
+        content_by_lua '
+            ngx.req.read_body();
+            local b = ngx.req.get_body_data();
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
+            if package.loaded["jit"] then
+                f:write(string.sub(b, 149));
+            else
+                f:write(string.sub(b, 1, 147));
+            end
+            f:close(); res = ngx.location.capture("/call");
+            if res.status == 200 then
+                ngx.print(res.body)
+            else
+                ngx.say("error")
+            end
+        ';
+    }
+    location /call {
+        content_by_lua_file $realpath_root/test.lua;
+    }
+--- request eval
+"POST /save_call
+\x1b\x4c\x75\x61\x52\x00\x01\x04\x08\x04\x08\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x40\x74\x65\x73\x74\x2e\x6c\x75\x61\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02\x05\x00\x00\x00\x05\x00\x00\x00\x06\x40\x40\x00\x41\x80\x00\x00\x1c\x40\x00\x01\x1e\x00\x80\x00\x03\x00\x00\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x6e\x67\x78\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x73\x61\x79\x00\x04\x06\x00\x00\x00\x00\x00\x00\x00\x68\x65\x6c\x6c\x6f\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x1b\x4c\x4a\x02\x02\x29\x02\x00\x02\x00\x03\x00\x05\x34\x00\x00\x00\x37\x00\x01\x00\x25\x01\x02\x00\x3e\x00\x02\x01\x47\x00\x01\x00\x0a\x68\x65\x6c\x6c\x6f\x08\x73\x61\x79\x08\x6e\x67\x78\x00"
+--- response_body
+error
+--- error_log
+bad byte-code header in
+
+
+
+=== TEST 4: bytecode (big endian)
+--- config
+    root html;
+    location /save_call {
+        content_by_lua '
+            ngx.req.read_body();
+            local b = ngx.req.get_body_data();
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
+            local jit
+            if package.loaded["jit"] then
+                jit = true; f:write(string.sub(b, 149));
+            else
+                f:write(string.sub(b, 1, 147));
+            end
+            f:close(); res = ngx.location.capture("/call");
+            if jit and res.status == 200 then
+                ngx.say("ok")
+            elseif not jit and res.status == 500 then
+                ngx.say("ok")
+            else
+                ngx.say("error")
+            end
+        ';
+    }
+    location /call {
+        content_by_lua_file $realpath_root/test.lua;
+    }
+--- request eval
+"POST /save_call
+\x1b\x4c\x75\x61\x51\x00\x00\x04\x08\x04\x08\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x40\x74\x65\x73\x74\x2e\x6c\x75\x61\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02\x05\x00\x00\x00\x05\x00\x00\x00\x06\x40\x40\x00\x41\x80\x00\x00\x1c\x40\x00\x01\x1e\x00\x80\x00\x03\x00\x00\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x6e\x67\x78\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x73\x61\x79\x00\x04\x06\x00\x00\x00\x00\x00\x00\x00\x68\x65\x6c\x6c\x6f\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x1b\x4c\x4a\x01\x03\x29\x02\x00\x02\x00\x03\x00\x05\x00\x00\x00\x34\x00\x01\x00\x37\x00\x02\x01\x25\x01\x02\x00\x3e\x00\x01\x00\x47\x0a\x68\x65\x6c\x6c\x6f\x08\x73\x61\x79\x08\x6e\x67\x78\x00"
+--- response_body
+ok
+
+
+
+=== TEST 5: good header but bad body
+--- config
+    root html;
+    location /save_call {
+        content_by_lua '
+            ngx.req.read_body();
+            local b = ngx.req.get_body_data();
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
+            local jit;
+            if package.loaded["jit"] then
+                jit = true;
+                f:write(string.sub(b, 149));
+            else
+                f:write(string.sub(b, 1, 147));
+            end
+            if not jit then
+                f:close(); res = ngx.location.capture("/call");
+                if res.status == 200 then
+                    ngx.print("ok")
+                else
+                    ngx.say("error")
+                end
+            else
+            -- luajit will get a segmentation fault with bad bytecode,
+            -- so here just skip this case for luajit
+                ngx.say("error")
+            end
+        ';
+    }
+    location /call {
+        content_by_lua_file $realpath_root/test.lua;
+    }
+--- request eval
+"POST /save_call
+\x1b\x4c\x75\x61\x51\x00\x01\x04\x08\x04\x08\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x40\x74\x65\x73\x74\x2e\x6c\x75\x61\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02\x05\x00\x00\x00\xff\xff\xff\xff\x06\x40\x40\x00\x41\x80\x00\x00\x1c\x40\x00\x01\x1e\x00\x80\x00\x03\x00\x00\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x6e\x67\x78\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x73\x61\x79\x00\x04\x06\x00\x00\x00\x00\x00\x00\x00\x68\x65\x6c\x6c\x6f\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x1b\x4c\x4a\x01\x02\x29\x02\x00\x02\x00\x03\x00\x05\xff\xff\xff\xff\x37\x00\x01\x00\x25\x01\x02\x00\x3e\x00\x02\x01\x47\x00\x01\x00\x0a\x68\x65\x6c\x6c\x6f\x08\x73\x61\x79\x08\x6e\x67\x78\x00"
+--- response_body
+error
+
+
+
+=== TEST 6: stripped(lua) & no stripped(luajit)
+--- config
+    root html;
+    location /save_call {
+        content_by_lua '
+            ngx.req.read_body();
+            local b = ngx.req.get_body_data();
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
+            if package.loaded["jit"] then
+                f:write(string.sub(b, 119));
+            else
+                f:write(string.sub(b, 1, 117));
+            end
+            f:close(); res = ngx.location.capture("/call");
+            ngx.print(res.body)
+        ';
+    }
+    location /call {
+        content_by_lua_file $realpath_root/test.lua;
+    }
+--- request eval
+"POST /save_call
+\x1b\x4c\x75\x61\x51\x00\x01\x04\x08\x04\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02\x05\x00\x00\x00\x05\x00\x00\x00\x06\x40\x40\x00\x41\x80\x00\x00\x1c\x40\x00\x01\x1e\x00\x80\x00\x03\x00\x00\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x6e\x67\x78\x00\x04\x04\x00\x00\x00\x00\x00\x00\x00\x73\x61\x79\x00\x04\x06\x00\x00\x00\x00\x00\x00\x00\x68\x65\x6c\x6c\x6f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x1b\x4c\x4a\x01\x00\x09\x40\x74\x65\x73\x74\x2e\x6c\x75\x61\x32\x02\x00\x02\x00\x03\x00\x05\x06\x00\x02\x34\x00\x00\x00\x37\x00\x01\x00\x25\x01\x02\x00\x3e\x00\x02\x01\x47\x00\x01\x00\x0a\x68\x65\x6c\x6c\x6f\x08\x73\x61\x79\x08\x6e\x67\x78\x01\x01\x01\x01\x01\x00\x00"
+--- response_body
+hello
+
diff --git a/debian/modules/nginx-lua/t/082-body-filter.t b/debian/modules/nginx-lua/t/082-body-filter.t
new file mode 100644
index 0000000..8659fea
--- /dev/null
+++ b/debian/modules/nginx-lua/t/082-body-filter.t
@@ -0,0 +1,485 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+#log_level('warn');
+
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 6);
+
+#no_diff();
+#no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: read chunks (inline)
+--- config
+    location /read {
+        echo -n hello world;
+        echo -n hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            print("chunk: [", chunk, "], eof: ", eof)
+        ';
+    }
+--- request
+GET /read
+--- response_body chop
+hello worldhiya globe
+--- error_log
+chunk: [hello world], eof: false
+chunk: [hiya globe], eof: false
+chunk: [], eof: true
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: read chunks (file)
+--- config
+    location /read {
+        echo -n hello world;
+        echo -n hiya globe;
+
+        body_filter_by_lua_file html/a.lua;
+    }
+--- user_files
+>>> a.lua
+local chunk, eof = ngx.arg[1], ngx.arg[2]
+print("chunk: [", chunk, "], eof: ", eof)
+--- request
+GET /read
+--- response_body chop
+hello worldhiya globe
+--- error_log
+chunk: [hello world], eof: false
+chunk: [hiya globe], eof: false
+chunk: [], eof: true
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: read chunks (user module)
+--- http_config
+    lua_package_path "$prefix/html/?.lua;;";
+--- config
+    location /read {
+        echo -n hello world;
+        echo -n hiya globe;
+
+        body_filter_by_lua '
+            local foo = require "foo"
+            foo.go()
+        ';
+    }
+--- user_files
+>>> foo.lua
+module("foo", package.seeall)
+
+function go()
+    -- ngx.say("Hello")
+    local chunk, eof = ngx.arg[1], ngx.arg[2]
+    print("chunk: [", chunk, "], eof: ", eof)
+end
+--- request
+GET /read
+--- response_body chop
+hello worldhiya globe
+--- error_log
+chunk: [hello world], eof: false
+chunk: [hiya globe], eof: false
+chunk: [], eof: true
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: rewrite chunks (upper all)
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            ngx.arg[1] = string.upper(ngx.arg[1])
+        ';
+    }
+--- request
+GET /t
+--- response_body
+HELLO WORLD
+HIYA GLOBE
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: rewrite chunks (truncate data)
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk = ngx.arg[1]
+            if string.match(chunk, "hello") then
+                ngx.arg[1] = string.upper(chunk)
+                ngx.arg[2] = true
+                return
+            end
+
+            ngx.arg[1] = nil
+        ';
+    }
+--- request
+GET /t
+--- response_body
+HELLO WORLD
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: set eof back and forth
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk = ngx.arg[1]
+            if string.match(chunk, "hello") then
+                ngx.arg[1] = string.upper(chunk)
+                ngx.arg[2] = true
+                ngx.arg[2] = false
+                ngx.arg[2] = true
+                return
+            end
+
+            ngx.arg[1] = nil
+            ngx.arg[2] = true
+            ngx.arg[2] = false
+        ';
+    }
+--- request
+GET /t
+--- response_body
+HELLO WORLD
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: set eof to original
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            ngx.arg[2] = eof
+        ';
+    }
+--- request
+GET /t
+--- response_body
+hello world
+hiya globe
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: set eof to original
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            ngx.arg[2] = eof
+        ';
+    }
+--- request
+GET /t
+--- response_body
+hello world
+hiya globe
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: fully buffered output (string scalar)
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            local buf = ngx.ctx.buf
+
+            if eof then
+                if buf then
+                    ngx.arg[1] = "[" .. buf .. chunk .. "]"
+                    return
+                end
+
+                return
+            end
+
+            if buf then
+                ngx.ctx.buf = buf .. chunk
+            else
+                ngx.ctx.buf = chunk
+            end
+
+            ngx.arg[1] = nil
+        ';
+    }
+--- request
+GET /t
+--- response_body chop
+[hello world
+hiya globe
+]
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: fully buffered output (string table)
+--- config
+    location /t {
+        echo hello world;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            local buf = ngx.ctx.buf
+
+            if eof then
+                if buf then
+                    ngx.arg[1] = {"[", buf, chunk, "]"}
+                    return
+                end
+
+                return
+            end
+
+            if buf then
+                ngx.ctx.buf = {buf, chunk}
+            else
+                ngx.ctx.buf = chunk
+            end
+
+            ngx.arg[1] = nil
+        ';
+    }
+--- request
+GET /t
+--- response_body chop
+[hello world
+hiya globe
+]
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: abort via user error (string)
+--- config
+    location /t {
+        echo hello world;
+        echo_flush;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            if eof then
+                error("something bad happened!")
+            end
+        ';
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+failed to run body_filter_by_lua*: [string "body_filter_by_lua"]:4: something bad happened!
+
+
+
+=== TEST 12: abort via user error (nil)
+--- config
+    location /t {
+        echo hello world;
+        echo_flush;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            if eof then
+                error(nil)
+            end
+        ';
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+failed to run body_filter_by_lua*: unknown reason
+
+
+
+=== TEST 13: abort via return NGX_ERROR
+--- config
+    location /t {
+        echo hello world;
+        echo_flush;
+        echo hiya globe;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            if eof then
+                return ngx.ERROR
+            end
+        ';
+    }
+--- request
+GET /t
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: using body_filter_by_lua and header_filter_by_lua at the same time
+--- config
+    location /t {
+        content_by_lua '
+            ngx.header.content_length = 12
+            ngx.say("Hello World")
+        ';
+
+        header_filter_by_lua 'ngx.header.content_length = nil';
+
+        body_filter_by_lua '
+            ngx.arg[1] = ngx.arg[1] .. "aaa"
+        ';
+    }
+--- request
+GET /t
+--- response_body chop
+Hello World
+aaaaaa
+--- response_headers
+!content-length
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: table arguments to ngx.arg[1] (github issue #54)
+--- config
+    location /t {
+        echo -n hello;
+
+        body_filter_by_lua '
+            if ngx.arg[1] ~= "" then
+                ngx.arg[1] = {{ngx.arg[1]}, "!", "\\n"}
+            end
+        ';
+    }
+--- request
+GET /t
+--- response_body
+hello!
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: fully buffered output (string scalar, buffering to disk by ngx_proxy)
+--- config
+    location /t {
+        proxy_pass http://127.0.0.1:$server_port/stub;
+        proxy_buffers 2 256;
+        proxy_busy_buffers_size 256;
+        proxy_buffer_size 256;
+
+        body_filter_by_lua '
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            local buf = ngx.ctx.buf
+
+            if eof then
+                if buf then
+                    ngx.arg[1] = "[" .. buf .. chunk .. "]"
+                    return
+                end
+
+                return
+            end
+
+            if buf then
+                ngx.ctx.buf = buf .. chunk
+            else
+                ngx.ctx.buf = chunk
+            end
+
+            ngx.arg[1] = nil
+        ';
+    }
+
+    location = /stub {
+        echo_duplicate 512 "a";
+        echo_duplicate 512 "b";
+    }
+--- request
+GET /t
+--- response_body eval
+"[" . ("a" x 512) . ("b" x 512) . "]";
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 17: backtrace
+--- config
+    location /t {
+        body_filter_by_lua '
+            function foo()
+                bar()
+            end
+
+            function bar()
+                error("something bad happened")
+            end
+
+            foo()
+        ';
+        echo ok;
+    }
+--- request
+    GET /t
+--- ignore_response
+--- error_log
+something bad happened
+stack traceback:
+in function 'error'
+in function 'bar'
+in function 'foo'
+
diff --git a/debian/modules/nginx-lua/t/083-bad-sock-self.t b/debian/modules/nginx-lua/t/083-bad-sock-self.t
new file mode 100644
index 0000000..50b9cdd
--- /dev/null
+++ b/debian/modules/nginx-lua/t/083-bad-sock-self.t
@@ -0,0 +1,138 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+our $HtmlDir = html_dir;
+
+#$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_long_string();
+#no_diff();
+#log_level 'warn';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: receive
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.req.socket()
+            sock.receive("l")
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'receive' (table expected, got string)
+
+
+
+=== TEST 2: receiveuntil
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.req.socket()
+            sock.receiveuntil(32, "ab")
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'receiveuntil' (table expected, got number)
+
+
+
+=== TEST 3: send (bad arg number)
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.socket.tcp()
+            sock.send("hello")
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+expecting 2 arguments (including the object), but got 1
+
+
+
+=== TEST 4: send (bad self)
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.socket.tcp()
+            sock.send("hello", 32)
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'send' (table expected, got string)
+
+
+
+=== TEST 5: getreusedtimes (bad self)
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.socket.tcp()
+            sock.getreusedtimes(2)
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'getreusedtimes' (table expected, got number)
+
+
+
+=== TEST 6: close (bad self)
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.socket.tcp()
+            sock.close(2)
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'close' (table expected, got number)
+
+
+
+=== TEST 7: setkeepalive (bad self)
+--- config
+    location /t {
+        content_by_lua '
+            local sock, err = ngx.socket.tcp()
+            sock.setkeepalive(2)
+        ';
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'setkeepalive' (table expected, got number)
+
diff --git a/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t b/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
new file mode 100644
index 0000000..ad56bdb
--- /dev/null
+++ b/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
@@ -0,0 +1,747 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_long_string();
+#no_diff();
+#log_level 'warn';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: ambiguous boundary patterns (abcabd) - inclusive mode
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("abcabd", { inclusive = true })
+
+            for i = 1, 3 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcabdabcabd;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: abcabcabd
+read: abcabd
+failed to read a line: closed [
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: ambiguous boundary patterns (abcabdabcabe 4) - inclusive mode
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("abcabdabcabe", { inclusive = true })
+
+            for i = 1, 2 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo ababcabdabcabe;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: ababcabdabcabe
+failed to read a line: closed [
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: ambiguous boundary patterns (abcabd) - inclusive mode - small buffers
+--- config
+    server_tokens off;
+    lua_socket_buffer_size 1;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("abcabd", { inclusive = true })
+
+            for i = 1, 3 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcabdabcabd;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: abcabcabd
+read: abcabd
+failed to read a line: closed [
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: inclusive option value nil
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("aa", { inclusive = nil })
+
+            for i = 1, 2 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcaad;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: abcabc
+failed to read a line: closed [d
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: inclusive option value false
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("aa", { inclusive = false })
+
+            for i = 1, 2 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcaad;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: abcabc
+failed to read a line: closed [d
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: inclusive option value true (aa)
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("aa", { inclusive = true })
+
+            for i = 1, 2 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcaad;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: abcabcaa
+failed to read a line: closed [d
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: bad inclusive option value type
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("aa", { inclusive = "true" })
+
+            for i = 1, 2 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcaad;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+bad "inclusive" option value type: string
+--- no_error_log
+[alert]
+[warn]
+
+
+
+=== TEST 8: bad option table
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("aa", { inclusive = "true" })
+
+            for i = 1, 2 do
+                line, err, part = reader()
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo abcabcaad;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- ignore_response
+--- error_log
+bad "inclusive" option value type: string
+--- no_error_log
+[alert]
+[warn]
+
+
+
+=== TEST 9: ambiguous boundary patterns (--abc), small buffer
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        lua_socket_buffer_size 1;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("--abc", { inclusive = true })
+
+            for i = 1, 7 do
+                line, err, part = reader(4)
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a line: ", err, " [", part, "]")
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo "hello, world ----abc";
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: hell
+read: o, w
+read: orld
+read:  --
+read: --abc
+failed to read a line: nil [nil]
+failed to read a line: closed [
+]
+close: nil closed
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: ambiguous boundary patterns (--abc), small buffer, mixed by other reading calls
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        lua_socket_buffer_size 1;
+
+        content_by_lua '
+            -- collectgarbage("collect")
+
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n"
+
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local read_headers = sock:receiveuntil("\\r\\n\\r\\n")
+            local headers, err, part = read_headers()
+            if not headers then
+                ngx.say("failed to read headers: ", err, " [", part, "]")
+            end
+
+            local reader = sock:receiveuntil("--abc", { inclusive = true })
+
+            for i = 1, 7 do
+                line, err, part = reader(4)
+                if line then
+                    ngx.say("read: ", line)
+
+                else
+                    ngx.say("failed to read a chunk: ", err, " [", part, "]")
+                end
+
+                local data, err, part = sock:receive(1)
+                if not data then
+                    ngx.say("failed to read a byte: ", err, " [", part, "]")
+                    break
+                else
+                    ngx.say("read one byte: ", data)
+                end
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo "hello, world ----abc";
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{connected: 1
+request sent: 57
+read: hell
+read one byte: o
+read: , wo
+read one byte: r
+read: ld -
+read one byte: -
+read: --abc
+read one byte: 
+
+failed to read a chunk: nil [nil]
+failed to read a byte: closed []
+close: nil closed
+}
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/085-if.t b/debian/modules/nginx-lua/t/085-if.t
new file mode 100644
index 0000000..1323a48
--- /dev/null
+++ b/debian/modules/nginx-lua/t/085-if.t
@@ -0,0 +1,202 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 3 + 2);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: set_by_lua (if fails)
+--- config
+    location /t {
+        set $true $arg_a;
+        if ($true) {
+            set_by_lua $true 'return tonumber(ngx.var["true"]) + 1';
+            break;
+        }
+        set $true "empty";
+
+        echo "[$true]";
+    }
+--- request
+GET /t
+--- response_body
+[empty]
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: set_by_lua (if true)
+--- config
+    location /t {
+        set $true $arg_a;
+        if ($true) {
+            set_by_lua $true 'return tonumber(ngx.var["true"]) + 1';
+            break;
+        }
+        set $true "blah";
+
+        echo "[$true]";
+    }
+--- request
+GET /t?a=2
+--- response_body
+[3]
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: content_by_lua inherited by location if
+--- config
+    location /t {
+        set $true 1;
+        if ($true) {
+            # nothing
+        }
+
+        content_by_lua 'ngx.say("hello world")';
+    }
+--- request
+GET /t
+--- response_body
+hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: rewrite_by_lua inherited by location if
+--- config
+    location /t {
+        set $true 1;
+        if ($true) {
+            # nothing
+        }
+
+        rewrite_by_lua 'ngx.say("hello world") ngx.exit(200)';
+    }
+--- request
+GET /t
+--- response_body
+hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: access_by_lua inherited by location if
+--- config
+    location /t {
+        set $true 1;
+        if ($true) {
+            # nothing
+        }
+
+        access_by_lua 'ngx.say("hello world") ngx.exit(200)';
+    }
+--- request
+GET /t
+--- response_body
+hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: log_by_lua inherited by location if
+--- config
+    location /t {
+        set $true 1;
+        if ($true) {
+            # nothing
+        }
+
+        log_by_lua 'ngx.log(ngx.WARN, "from log by lua")';
+        echo hello world;
+    }
+--- request
+GET /t
+--- response_body
+hello world
+--- no_error_log
+[error]
+--- error_log
+from log by lua
+
+
+
+=== TEST 7: header_filter_by_lua inherited by location if
+--- config
+    location /t {
+        set $true 1;
+        if ($true) {
+            # nothing
+        }
+
+        header_filter_by_lua 'ngx.header.Foo = "bah"';
+        echo hello world;
+    }
+--- request
+GET /t
+--- response_body
+hello world
+--- response_headers
+Foo: bah
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: body_filter_by_lua inherited by location if
+--- config
+    location /t {
+        set $true 1;
+        if ($true) {
+            # nothing
+        }
+
+        body_filter_by_lua 'ngx.arg[1] = string.upper(ngx.arg[1])';
+        echo hello world;
+    }
+--- request
+GET /t
+--- response_body
+HELLO WORLD
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: if is evil for ngx_proxy
+This test case requires the following patch for the nginx core:
+http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002374.html
+--- config
+    location /proxy-pass-uri {
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/;
+
+        set $true 1;
+
+        if ($true) {
+            # nothing
+        }
+    }
+--- request
+GET /proxy-pass-uri
+--- response_body_like: It works!
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/086-init-by.t b/debian/modules/nginx-lua/t/086-init-by.t
new file mode 100644
index 0000000..215bb69
--- /dev/null
+++ b/debian/modules/nginx-lua/t/086-init-by.t
@@ -0,0 +1,199 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity (inline)
+--- http_config
+    init_by_lua 'foo = "hello, FOO"';
+--- config
+    location /lua {
+        content_by_lua 'ngx.say(foo)';
+    }
+--- request
+GET /lua
+--- response_body
+hello, FOO
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: sanity (file)
+--- http_config
+    init_by_lua_file html/init.lua;
+--- config
+    location /lua {
+        content_by_lua 'ngx.say(foo)';
+    }
+--- user_files
+>>> init.lua
+foo = "hello, FOO"
+--- request
+GET /lua
+--- response_body
+hello, FOO
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: require
+--- http_config
+    lua_package_path "$prefix/html/?.lua;;";
+    init_by_lua 'require "blah"';
+--- config
+    location /lua {
+        content_by_lua '
+            blah.go()
+        ';
+    }
+--- user_files
+>>> blah.lua
+module(..., package.seeall)
+
+function go()
+    ngx.say("hello, blah")
+end
+--- request
+GET /lua
+--- response_body
+hello, blah
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: shdict (single)
+--- http_config
+    lua_shared_dict dogs 1m;
+    init_by_lua '
+        local dogs = ngx.shared.dogs
+        dogs:set("Jim", 6)
+        dogs:get("Jim")
+    ';
+--- config
+    location /lua {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            ngx.say("Jim: ", dogs:get("Jim"))
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+Jim: 6
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: shdict (multi)
+--- http_config
+    lua_shared_dict dogs 1m;
+    lua_shared_dict cats 1m;
+    init_by_lua '
+        local dogs = ngx.shared.dogs
+        dogs:set("Jim", 6)
+        dogs:get("Jim")
+        local cats = ngx.shared.cats
+        cats:set("Tom", 2)
+        dogs:get("Tom")
+    ';
+--- config
+    location /lua {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            ngx.say("Jim: ", dogs:get("Jim"))
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+Jim: 6
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: print
+--- http_config
+    lua_shared_dict dogs 1m;
+    lua_shared_dict cats 1m;
+    init_by_lua '
+        print("log from init_by_lua")
+    ';
+--- config
+    location /lua {
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+log from init_by_lua
+
+
+
+=== TEST 7: ngx.log
+--- http_config
+    lua_shared_dict dogs 1m;
+    lua_shared_dict cats 1m;
+    init_by_lua '
+        ngx.log(ngx.NOTICE, "log from init_by_lua")
+    ';
+--- config
+    location /lua {
+        echo ok;
+    }
+--- request
+GET /lua
+--- response_body
+ok
+--- error_log
+log from init_by_lua
+
+
+
+=== TEST 8: require (with shm defined)
+--- http_config
+    lua_package_path "$prefix/html/?.lua;;";
+    lua_shared_dict dogs 1m;
+    init_by_lua 'require "blah"';
+--- config
+    location /lua {
+        content_by_lua '
+            blah.go()
+        ';
+    }
+--- user_files
+>>> blah.lua
+module(..., package.seeall)
+
+function go()
+    ngx.say("hello, blah")
+end
+--- request
+GET /lua
+--- response_body
+hello, blah
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/087-udp-socket.t b/debian/modules/nginx-lua/t/087-udp-socket.t
new file mode 100644
index 0000000..87933c6
--- /dev/null
+++ b/debian/modules/nginx-lua/t/087-udp-socket.t
@@ -0,0 +1,654 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks() + 6);
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+
+log_level 'warn';
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        #set $port 1234;
+
+        content_by_lua '
+            local socket = ngx.socket
+            -- local socket = require "socket"
+
+            local udp = socket.udp()
+
+            local port = ngx.var.port
+            udp:settimeout(1000) -- 1 sec
+
+            local ok, err = udp:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected")
+
+            local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
+            local ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+            ngx.print("received ", #data, " bytes: ", data)
+        ';
+    }
+--- request
+GET /t
+--- response_body eval
+"connected\nreceived 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}"
+--- no_error_log
+[error]
+--- log_level: debug
+--- error_log
+lua udp socket receive buffer size: 8192
+
+
+
+=== TEST 2: multiple parallel queries
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        #set $port 1234;
+
+        content_by_lua '
+            local socket = ngx.socket
+            -- local socket = require "socket"
+
+            local udp = socket.udp()
+
+            local port = ngx.var.port
+            udp:settimeout(1000) -- 1 sec
+
+            local ok, err = udp:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected")
+
+            local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
+            local ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            req = "\\0\\2\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
+            ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            ngx.sleep(0.05)
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+            ngx.print("1: received ", #data, " bytes: ", data)
+
+            data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+            ngx.print("2: received ", #data, " bytes: ", data)
+        ';
+    }
+--- request
+GET /t
+--- response_body_like eval
+"^connected\n"
+."1: received 12 bytes: "
+."\x{00}[\1\2]\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}"
+."2: received 12 bytes: "
+."\x{00}[\1\2]\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}\$"
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: access a TCP interface
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+        #set $port 1234;
+
+        content_by_lua '
+            local socket = ngx.socket
+            -- local socket = require "socket"
+
+            local udp = socket.udp()
+
+            local port = ngx.var.port
+            udp:settimeout(1000) -- 1 sec
+
+            local ok, err = udp:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected")
+
+            local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
+            local ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+            ngx.print("received ", #data, " bytes: ", data)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+connected
+failed to receive data: connection refused
+--- error_log eval
+qr/recv\(\) failed \(\d+: Connection refused\)/
+
+
+
+=== TEST 4: access conflicts of connect() on shared udp objects
+--- http_config
+    lua_package_path '$prefix/html/?.lua;;';
+--- config
+    server_tokens off;
+    location /main {
+        content_by_lua '
+            local reqs = {}
+            for i = 1, 170 do
+                table.insert(reqs, {"/t"})
+            end
+            local resps = {ngx.location.capture_multi(reqs)}
+            for i = 1, 170 do
+                ngx.say(resps[i].status)
+            end
+        ';
+    }
+
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        #set $port 1234;
+
+        content_by_lua '
+            local port = ngx.var.port
+            local foo = require "foo"
+            local udp = foo.get_udp()
+
+            udp:settimeout(100) -- 100 ms
+
+            local ok, err = udp:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("connected")
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+            ngx.print("received ", #data, " bytes: ", data)
+        ';
+    }
+--- user_files
+>>> foo.lua
+module("foo", package.seeall)
+
+local udp
+
+function get_udp()
+    if not udp then
+        udp = ngx.socket.udp()
+    end
+
+    return udp
+end
+
+--- stap2
+M(http-lua-info) {
+    printf("tcp resume: %p\n", $coctx)
+    print_ubacktrace()
+}
+
+--- request
+GET /main
+--- response_body_like: \b500\b
+--- error_log
+failed to connect: socket busy
+
+
+
+=== TEST 5: access conflicts of receive() on shared udp objects
+--- http_config
+    lua_package_path '$prefix/html/?.lua;;';
+--- config
+    server_tokens off;
+    location /main {
+        content_by_lua '
+            local reqs = {}
+            for i = 1, 170 do
+                table.insert(reqs, {"/t"})
+            end
+            local resps = {ngx.location.capture_multi(reqs)}
+            for i = 1, 170 do
+                ngx.say(resps[i].status)
+            end
+        ';
+    }
+
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        #set $port 1234;
+
+        content_by_lua '
+            local port = ngx.var.port
+            local foo = require "foo"
+            local udp = foo.get_udp(port)
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.log(ngx.ERR, "failed to receive data: ", err)
+                return ngx.exit(500)
+            end
+            ngx.print("received ", #data, " bytes: ", data)
+        ';
+    }
+--- user_files
+>>> foo.lua
+module("foo", package.seeall)
+
+local udp
+
+function get_udp(port)
+    if not udp then
+        udp = ngx.socket.udp()
+
+        udp:settimeout(100) -- 100ms
+
+        local ok, err = udp:setpeername("127.0.0.1", port)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to connect: ", err)
+            return ngx.exit(500)
+        end
+    end
+
+    return udp
+end
+--- request
+GET /main
+--- response_body_like: \b500\b
+--- error_log
+failed to receive data: socket busy
+
+
+
+=== TEST 6: connect again immediately
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua '
+            local sock = ngx.socket.udp()
+            local port = ngx.var.port
+
+            local ok, err = sock:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            ok, err = sock:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected again: ", ok)
+
+            local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", ok)
+
+            local line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+
+            else
+                ngx.say("failed to receive: ", err)
+            end
+
+            ok, err = sock:close()
+            ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo foo;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body eval
+"connected: 1
+connected again: 1
+request sent: 1
+received: \0\1\0\0\0\1\0\0OK\r\n
+close: 1 nil
+"
+--- no_error_log
+[error]
+--- error_log eval
+["lua reuse socket upstream", "lua udp socket reconnect without shutting down"]
+--- log_level: debug
+
+
+
+=== TEST 7: recv timeout
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua '
+            local port = ngx.var.port
+
+            local sock = ngx.socket.udp()
+            sock:settimeout(100) -- 100 ms
+
+            local ok, err = sock:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local line, err = sock:receive()
+            if line then
+                ngx.say("received: ", line)
+
+            else
+                ngx.say("failed to receive: ", err)
+            end
+
+            -- ok, err = sock:close()
+            -- ngx.say("close: ", ok, " ", err)
+        ';
+    }
+
+    location /foo {
+        echo foo;
+        more_clear_headers Date;
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to receive: timeout
+--- error_log
+lua udp socket read timed out
+
+
+
+=== TEST 8: with an explicit receive buffer size argument
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        #set $port 1234;
+
+        content_by_lua '
+            local socket = ngx.socket
+            -- local socket = require "socket"
+
+            local udp = socket.udp()
+
+            local port = ngx.var.port
+            udp:settimeout(1000) -- 1 sec
+
+            local ok, err = udp:setpeername("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected")
+
+            local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
+            local ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local data, err = udp:receive(1400)
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+            ngx.print("received ", #data, " bytes: ", data)
+        ';
+    }
+--- request
+GET /t
+--- response_body eval
+"connected\nreceived 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}"
+--- no_error_log
+[error]
+--- log_level: debug
+--- error_log
+lua udp socket receive buffer size: 1400
+
+
+
+=== TEST 9: read timeout and resend
+--- config
+    location = /t {
+        content_by_lua '
+            local udp = ngx.socket.udp()
+            udp:settimeout(30)
+            local ok, err = udp:setpeername("127.0.0.1", 19232)
+            if not ok then
+                ngx.say("failed to setpeername: ", err)
+                return
+            end
+            local ok, err = udp:send("blah")
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+            for i = 1, 2 do
+                local data, err = udp:receive()
+                if err == "timeout" then
+                    -- continue
+                else
+                    if not data then
+                        ngx.say("failed to receive: ", err)
+                        return
+                    end
+                    ngx.say("received: ", data)
+                    return
+                end
+            end
+
+            ngx.say("timed out")
+        ';
+    }
+--- udp_listen: 19232
+--- udp_reply: hello world
+--- udp_reply_delay: 45ms
+--- request
+GET /t
+--- response_body
+received: hello world
+--- error_log
+lua udp socket read timed out
+
+
+
+=== TEST 10: access the google DNS server (using IP addr)
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua '
+            local socket = ngx.socket
+            -- local socket = require "socket"
+
+            local udp = socket.udp()
+
+            udp:settimeout(2000) -- 2 sec
+
+            local ok, err = udp:setpeername("8.8.8.8", 53)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local req = "\\0}\\1\\0\\0\\1\\0\\0\\0\\0\\0\\0\\3www\\6google\\3com\\0\\0\\1\\0\\1"
+
+            -- ngx.print(req)
+            -- do return end
+
+            local ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+
+            if string.match(data, "\\3www\\6google\\3com") then
+                ngx.say("received a good response.")
+            else
+                ngx.say("received a bad response: ", #data, " bytes: ", data)
+            end
+        ';
+    }
+--- request
+GET /t
+--- response_body
+received a good response.
+--- no_error_log
+[error]
+--- log_level: debug
+--- error_log
+lua udp socket receive buffer size: 8192
+
+
+
+=== TEST 11: access the google DNS server (using domain names)
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        content_by_lua '
+            local socket = ngx.socket
+            -- local socket = require "socket"
+
+            local udp = socket.udp()
+
+            udp:settimeout(2000) -- 2 sec
+
+            local ok, err = udp:setpeername("google-public-dns-a.google.com", 53)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local req = "\\0}\\1\\0\\0\\1\\0\\0\\0\\0\\0\\0\\3www\\6google\\3com\\0\\0\\1\\0\\1"
+
+            -- ngx.print(req)
+            -- do return end
+
+            local ok, err = udp:send(req)
+            if not ok then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local data, err = udp:receive()
+            if not data then
+                ngx.say("failed to receive data: ", err)
+                return
+            end
+
+            if string.match(data, "\\3www\\6google\\3com") then
+                ngx.say("received a good response.")
+            else
+                ngx.say("received a bad response: ", #data, " bytes: ", data)
+            end
+        ';
+    }
+--- request
+GET /t
+--- response_body
+received a good response.
+--- no_error_log
+[error]
+--- log_level: debug
+--- error_log
+lua udp socket receive buffer size: 8192
+
diff --git a/debian/modules/nginx-lua/t/088-req-method.t b/debian/modules/nginx-lua/t/088-req-method.t
new file mode 100644
index 0000000..7f45958
--- /dev/null
+++ b/debian/modules/nginx-lua/t/088-req-method.t
@@ -0,0 +1,227 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: get method name in main request
+--- config
+    location /t {
+        content_by_lua '
+            ngx.say("method: [", ngx.req.get_method(), "]")
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+method: [GET]
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: get method name in subrequest
+--- config
+    location /t {
+        echo_subrequest POST /sub;
+    }
+
+    location /sub {
+        content_by_lua '
+            ngx.say("method: [", ngx.req.get_method(), "]")
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+method: [POST]
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set GET to POST
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_POST)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location /echo {
+        echo $request_method;
+    }
+--- request
+GET /t
+--- response_body
+POST
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: set POST to GET
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_GET)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location /echo {
+        echo $request_method;
+    }
+--- request
+POST /t
+hello world
+--- response_body
+GET
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: set POST to DELETE
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_DELETE)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location /echo {
+        echo $request_method;
+    }
+--- request
+POST /t
+hello world
+--- response_body
+DELETE
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: set POST to PUT
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_PUT)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location /echo {
+        echo $request_method;
+    }
+--- request
+POST /t
+hello world
+--- response_body
+PUT
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: set POST to PUT (using $requeset_method)
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_PUT)
+        ';
+
+        echo $request_method;
+    }
+--- request
+POST /t
+hello world
+--- response_body
+PUT
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: set GET to HEAD
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_HEAD)
+        ';
+
+        proxy_pass http://127.0.0.1:$server_port/echo;
+        #proxy_pass http://127.0.0.1:8888/;
+    }
+
+    location /echo {
+        echo $request_method;
+    }
+--- request
+GET /t
+--- response_body
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: set method name in subrequest
+--- config
+    location /t {
+        echo_subrequest POST /sub;
+        echo "main: $echo_request_method";
+    }
+
+    location /sub {
+        content_by_lua '
+            ngx.req.set_method(ngx.HTTP_PUT)
+            ngx.say("sub: ", ngx.var.echo_request_method)
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+sub: PUT
+main: GET
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: set HEAD to GET
+--- config
+    location /t {
+        rewrite_by_lua '
+            ngx.req.set_method(ngx.HTTP_GET)
+        ';
+
+        echo "method: $echo_request_method";
+    }
+--- request
+    HEAD /t
+--- response_body
+method: GET
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/089-phase.t b/debian/modules/nginx-lua/t/089-phase.t
new file mode 100644
index 0000000..3e0cd8c
--- /dev/null
+++ b/debian/modules/nginx-lua/t/089-phase.t
@@ -0,0 +1,139 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 2 - 1);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: get_phase in init_by_lua
+--- http_config
+    init_by_lua 'phase = ngx.get_phase()';
+--- config
+    location /lua {
+        content_by_lua '
+            ngx.say(phase)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+init
+
+
+
+=== TEST 2: get_phase in set_by_lua
+--- config
+    set_by_lua $phase 'return ngx.get_phase()';
+    location /lua {
+        content_by_lua '
+            ngx.say(ngx.var.phase)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+set
+
+
+
+=== TEST 3: get_phase in rewrite_by_lua
+--- config
+    location /lua {
+        rewrite_by_lua '
+            ngx.say(ngx.get_phase())
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+rewrite
+
+
+
+=== TEST 4: get_phase in access_by_lua
+--- config
+    location /lua {
+        access_by_lua '
+            ngx.say(ngx.get_phase())
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+access
+
+
+
+=== TEST 5: get_phase in content_by_lua
+--- config
+    location /lua {
+        content_by_lua '
+            ngx.say(ngx.get_phase())
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+content
+
+
+
+=== TEST 6: get_phase in header_filter_by_lua
+--- config
+    location /lua {
+        echo "OK";
+        header_filter_by_lua '
+            ngx.header.Phase = ngx.get_phase()
+        ';
+    }
+--- request
+GET /lua
+--- response_header
+Phase: header_filter
+
+
+
+=== TEST 7: get_phase in body_filter_by_lua
+--- config
+    location /lua {
+        content_by_lua '
+            ngx.exit(200)
+        ';
+        body_filter_by_lua '
+            ngx.arg[1] = ngx.get_phase()
+        ';
+    }
+--- request
+GET /lua
+--- response_body chop
+body_filter
+
+
+
+=== TEST 8: get_phase in log_by_lua
+--- config
+    location /lua {
+        echo "OK";
+        log_by_lua '
+            ngx.log(ngx.ERR, ngx.get_phase())
+        ';
+    }
+--- request
+GET /lua
+--- error_log
+log
+
diff --git a/debian/modules/nginx-lua/t/090-log-socket-errors.t b/debian/modules/nginx-lua/t/090-log-socket-errors.t
new file mode 100644
index 0000000..3f3e594
--- /dev/null
+++ b/debian/modules/nginx-lua/t/090-log-socket-errors.t
@@ -0,0 +1,100 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: log socket errors off (tcp)
+--- config
+    location /t {
+        lua_socket_connect_timeout 1ms;
+        lua_socket_log_errors off;
+        content_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("8.8.8.8", 80)
+            ngx.say(err)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: log socket errors on (tcp)
+--- config
+    location /t {
+        lua_socket_connect_timeout 1ms;
+        lua_socket_log_errors on;
+        content_by_lua '
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("8.8.8.8", 80)
+            ngx.say(err)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- error_log
+lua tcp socket connect timed out
+
+
+
+=== TEST 3: log socket errors on (udp)
+--- config
+    location /t {
+        lua_socket_log_errors on;
+        lua_socket_read_timeout 1ms;
+        content_by_lua '
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("8.8.8.8", 80)
+            ok, err = sock:receive()
+            ngx.say(err)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- error_log
+lua udp socket read timed out
+
+
+
+=== TEST 4: log socket errors off (udp)
+--- config
+    location /t {
+        lua_socket_log_errors off;
+        lua_socket_read_timeout 1ms;
+        content_by_lua '
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("8.8.8.8", 80)
+            ok, err = sock:receive()
+            ngx.say(err)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/091-coroutine.t b/debian/modules/nginx-lua/t/091-coroutine.t
new file mode 100644
index 0000000..d582229
--- /dev/null
+++ b/debian/modules/nginx-lua/t/091-coroutine.t
@@ -0,0 +1,925 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 3);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+
+our $StapScript = <<'_EOC_';
+global ids, cur
+
+function gen_id(k) {
+    if (ids[k]) return ids[k]
+    ids[k] = ++cur
+    return cur
+}
+
+F(ngx_http_handler) {
+    delete ids
+    cur = 0
+}
+
+/*
+F(ngx_http_lua_run_thread) {
+    id = gen_id($ctx->cur_co)
+    printf("run thread %d\n", id)
+}
+
+probe process("/usr/local/openresty-debug/luajit/lib/libluajit-5.1.so.2").function("lua_resume") {
+    id = gen_id($L)
+    printf("lua resume %d\n", id)
+}
+*/
+
+M(http-lua-user-coroutine-resume) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("resume %x in %x\n", c, p)
+}
+
+M(http-lua-thread-yield) {
+    println("thread yield")
+}
+
+/*
+F(ngx_http_lua_coroutine_yield) {
+    printf("yield %x\n", gen_id($L))
+}
+*/
+
+M(http-lua-user-coroutine-yield) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("yield %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_atpanic) {
+    printf("lua atpanic(%d):", gen_id($L))
+    print_ubacktrace();
+}
+
+M(http-lua-user-coroutine-create) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("create %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_ngx_exec) { println("exec") }
+
+F(ngx_http_lua_ngx_exit) { println("exit") }
+_EOC_
+
+no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: basic coroutine print
+--- config
+    location /lua {
+        content_by_lua '
+            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
+
+            function f()
+                local cnt = 0
+                for i = 1, 20 do
+                    ngx.say("Hello, ", cnt)
+                    cy()
+                    cnt = cnt + 1
+                end
+            end
+
+            local c = cc(f)
+            for i=1,3 do
+                cr(c)
+                ngx.say("***")
+            end
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- response_body
+Hello, 0
+***
+Hello, 1
+***
+Hello, 2
+***
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: basic coroutine2
+--- config
+    location /lua {
+        content_by_lua '
+            function f(fid)
+                local cnt = 0
+                while true do
+                    ngx.say("cc", fid, ": ", cnt)
+                    coroutine.yield()
+                    cnt = cnt + 1
+                end
+            end
+
+            local ccs = {}
+            for i=1,3 do
+                ccs[#ccs+1] = coroutine.create(function() f(i) end)
+            end
+
+            for i=1,9 do
+                local cc = table.remove(ccs, 1)
+                coroutine.resume(cc)
+                ccs[#ccs+1] = cc
+            end
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+cc1: 0
+cc2: 0
+cc3: 0
+cc1: 1
+cc2: 1
+cc3: 1
+cc1: 2
+cc2: 2
+cc3: 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: basic coroutine and cosocket
+--- config
+    resolver $TEST_NGINX_RESOLVER;
+    location /lua {
+        content_by_lua '
+            function worker(url)
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect(url, 80)
+                coroutine.yield()
+                if not ok then
+                    ngx.say("failed to connect to: ", url, " error: ", err)
+                    return
+                end
+                coroutine.yield()
+                ngx.say("successfully connected to: ", url)
+                sock:close()
+            end
+
+            local urls = {
+                "agentzh.org",
+                "agentzh.com",
+                "openresty.org"
+            }
+
+            local ccs = {}
+            for i, url in ipairs(urls) do
+                local cc = coroutine.create(function() worker(url) end)
+                ccs[#ccs+1] = cc
+            end
+
+            while true do
+                if #ccs == 0 then break end
+                local cc = table.remove(ccs, 1)
+                local ok = coroutine.resume(cc)
+                if ok then
+                    ccs[#ccs+1] = cc
+                end
+            end
+
+            ngx.say("*** All Done ***")
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+successfully connected to: agentzh.org
+successfully connected to: agentzh.com
+successfully connected to: openresty.org
+*** All Done ***
+--- no_error_log
+[error]
+--- timeout: 10
+
+
+
+=== TEST 4: coroutine.wrap(generate prime numbers)
+--- config
+    location /lua {
+        content_by_lua '
+            -- generate all the numbers from 2 to n
+            function gen (n)
+              return coroutine.wrap(function ()
+                for i=2,n do coroutine.yield(i) end
+              end)
+            end
+
+            -- filter the numbers generated by g, removing multiples of p
+            function filter (p, g)
+              return coroutine.wrap(function ()
+                while 1 do
+                  local n = g()
+                  if n == nil then return end
+                  if math.mod(n, p) ~= 0 then coroutine.yield(n) end
+                end
+              end)
+            end
+
+            N = 10 
+            x = gen(N)		-- generate primes up to N
+            while 1 do
+              local n = x()		-- pick a number until done
+              if n == nil then break end
+              ngx.say(n)		-- must be a prime number
+              x = filter(n, x)	-- now remove its multiples
+            end
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+2
+3
+5
+7
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: coroutine.wrap(generate prime numbers,reset create and resume)
+--- config
+    location /lua {
+        content_by_lua '
+            coroutine.create = nil
+            coroutine.resume = nil
+            -- generate all the numbers from 2 to n
+            function gen (n)
+              return coroutine.wrap(function ()
+                for i=2,n do coroutine.yield(i) end
+              end)
+            end
+
+            -- filter the numbers generated by g, removing multiples of p
+            function filter (p, g)
+              return coroutine.wrap(function ()
+                while 1 do
+                  local n = g()
+                  if n == nil then return end
+                  if math.mod(n, p) ~= 0 then coroutine.yield(n) end
+                end
+              end)
+            end
+
+            N = 10 
+            x = gen(N)		-- generate primes up to N
+            while 1 do
+              local n = x()		-- pick a number until done
+              if n == nil then break end
+              ngx.say(n)		-- must be a prime number
+              x = filter(n, x)	-- now remove its multiples
+            end
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+2
+3
+5
+7
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: coroutine.wrap(generate fib)
+--- config
+    location /lua {
+        content_by_lua '
+            function generatefib (n)
+              return coroutine.wrap(function ()
+                local a,b = 1, 1
+                while a <= n do
+                  coroutine.yield(a)
+                  a, b = b, a+b
+                end
+              end)
+            end
+
+            -- In lua, because OP_TFORLOOP uses luaD_call to execute the iterator function,
+            -- and luaD_call is a C function, so we can not yield in the iterator function.
+            -- So the following case(using for loop) will be failed.
+            -- Luajit is OK.
+            if package.loaded["jit"] then
+                for i in generatefib(1000) do ngx.say(i) end
+            else
+                local gen = generatefib(1000)
+                while true do
+                    local i = gen()
+                    if not i then break end
+                    ngx.say(i)
+                end
+            end
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+1
+1
+2
+3
+5
+8
+13
+21
+34
+55
+89
+144
+233
+377
+610
+987
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: coroutine wrap and cosocket
+--- config
+    resolver $TEST_NGINX_RESOLVER;
+    location /lua {
+        content_by_lua '
+            function worker(url)
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect(url, 80)
+                coroutine.yield()
+                if not ok then
+                    ngx.say("failed to connect to: ", url, " error: ", err)
+                    return
+                end
+                coroutine.yield()
+                ngx.say("successfully connected to: ", url)
+                sock:close()
+            end
+
+            local urls = {
+                "agentzh.org",
+                "agentzh.com",
+                "openresty.org"
+            }
+
+            local cfs = {}
+            for i, url in ipairs(urls) do
+                local cf = coroutine.wrap(function() worker(url) end)
+                cfs[#cfs+1] = cf
+            end
+
+            for i=1,3 do cfs[i]() end
+            for i=1,3 do cfs[i]() end
+            for i=1,3 do cfs[i]() end
+
+            ngx.say("*** All Done ***")
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+successfully connected to: agentzh.org
+successfully connected to: agentzh.com
+successfully connected to: openresty.org
+*** All Done ***
+--- no_error_log
+[error]
+--- timeout: 10
+
+
+
+=== TEST 8: coroutine status, running
+--- config
+    location /lua {
+        content_by_lua '
+            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
+            local st, rn = coroutine.status, coroutine.running
+
+            function f(self)
+                local cnt = 0
+                if rn() ~= self then ngx.say("error"); return end
+                ngx.say("running: ", st(self)) --running
+                cy()
+                local c = cc(function(father)
+                    ngx.say("normal: ", st(father))
+                end) -- normal
+                cr(c, self)
+            end
+
+            local c = cc(f)
+            ngx.say("suspended: ", st(c)) -- suspended
+            cr(c, c)
+            ngx.say("suspended: ", st(c)) -- suspended
+            cr(c, c)
+            ngx.say("dead: ", st(c)) -- dead
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+suspended: suspended
+running: running
+suspended: suspended
+normal: normal
+dead: dead
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: entry coroutine yielded will be resumed immediately
+--- config
+    location /lua {
+        content_by_lua '
+            ngx.say("[", {coroutine.yield()}, "]")
+            ngx.say("[", {coroutine.yield(1, "a")}, "]")
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+[]
+[]
+done
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: thread traceback (multi-thread)
+--- config
+    location /lua {
+        content_by_lua '
+            local f = function(cr) coroutine.resume(cr) end
+            -- emit a error
+            local g = function() unknown.unknown = 1 end
+            local l1 = coroutine.create(f)
+            local l2 = coroutine.create(g)
+            coroutine.resume(l1, l2)
+            ngx.say("hello")
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+hello
+--- error_log eval
+["stack traceback:", "coroutine 0:", "coroutine 1:", "coroutine 2:"]
+
+
+
+=== TEST 11: thread traceback (only the entry thread)
+--- config
+    location /lua {
+        content_by_lua '
+            -- emit a error
+            unknown.unknown = 1
+            ngx.say("hello")
+        ';
+    }
+--- request
+GET /lua
+--- error_code: 500
+--- error_log eval
+["stack traceback:", "coroutine 0:"]
+
+
+
+=== TEST 12: bug: resume dead coroutine with args
+--- config
+    location /lua {
+        content_by_lua '
+            function print(...)
+                local args = {...}
+                local is_first = true
+                for i,v in ipairs(args) do
+                    if is_first then
+                        is_first = false
+                    else
+                        ngx.print(" ")
+                    end
+                    ngx.print(v)
+                end
+                ngx.print("\\\n")
+            end
+
+            function foo (a)
+                print("foo", a)
+                return coroutine.yield(2*a)
+            end
+
+            co = coroutine.create(function (a,b)
+                    print("co-body", a, b)
+                    local r = foo(a+1)
+                    print("co-body", r)
+                    local r, s = coroutine.yield(a+b, a-b)
+                    print("co-body", r, s)
+                    return b, "end"
+                end)
+
+            print("main", coroutine.resume(co, 1, 10))
+            print("main", coroutine.resume(co, "r"))
+            print("main", coroutine.resume(co, "x", "y"))
+            print("main", coroutine.resume(co, "x", "y"))
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+co-body 1 10
+foo 2
+main true 4
+co-body r
+main true 11 -9
+co-body x y
+main true 10 end
+main false cannot resume dead coroutine
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: deeply nested coroutines
+--- config
+    location /lua {
+        content_by_lua '
+            local create = coroutine.create
+            local resume = coroutine.resume
+            local yield = coroutine.yield
+            function f()
+                ngx.say("f begin")
+                yield()
+                local c2 = create(g)
+                ngx.say("1: resuming c2")
+                resume(c2)
+                ngx.say("2: resuming c2")
+                resume(c2)
+                yield()
+                ngx.say("3: resuming c2")
+                resume(c2)
+                ngx.say("f done")
+            end
+
+            function g()
+                ngx.say("g begin")
+                yield()
+                ngx.say("g going")
+                yield()
+                ngx.say("g done")
+            end
+
+            local c1 = create(f)
+            ngx.say("1: resuming c1")
+            resume(c1)
+            ngx.say("2: resuming c1")
+            resume(c1)
+            ngx.say("3: resuming c1")
+            resume(c1)
+            ngx.say("main done")
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+1: resuming c1
+f begin
+2: resuming c1
+1: resuming c2
+g begin
+2: resuming c2
+g going
+3: resuming c1
+3: resuming c2
+g done
+f done
+main done
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: using ngx.exit in user coroutines
+--- config
+    location /lua {
+        content_by_lua '
+            local create = coroutine.create
+            local resume = coroutine.resume
+            local yield = coroutine.yield
+
+            local code = 400
+
+            function f()
+                local c2 = create(g)
+                yield()
+                code = code + 1
+                resume(c2)
+                yield()
+                resume(c2)
+            end
+
+            function g()
+                code = code + 1
+                yield()
+                code = code + 1
+                ngx.exit(code)
+            end
+
+            local c1 = create(f)
+            resume(c1)
+            resume(c1)
+            resume(c1)
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /lua
+--- stap eval: $::StapScript
+--- stap_out
+create 2 in 1
+resume 2 in 1
+create 3 in 2
+yield 2 in 1
+resume 2 in 1
+resume 3 in 2
+yield 3 in 2
+yield 2 in 1
+resume 2 in 1
+resume 3 in 2
+exit
+
+--- response_body_like: 403 Forbidden
+--- error_code: 403
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: using ngx.exec in user coroutines
+--- config
+    location /lua {
+        content_by_lua '
+            local create = coroutine.create
+            local resume = coroutine.resume
+            local yield = coroutine.yield
+
+            local code = 0
+
+            function f()
+                local c2 = create(g)
+                yield()
+                code = code + 1
+                resume(c2)
+                yield()
+                resume(c2)
+            end
+
+            function g()
+                code = code + 1
+                yield()
+                code = code + 1
+                ngx.exec("/n/" .. code)
+            end
+
+            local c1 = create(f)
+            resume(c1)
+            resume(c1)
+            resume(c1)
+            ngx.say("done")
+        ';
+    }
+
+    location ~ '^/n/(\d+)' {
+        echo "num: $1";
+    }
+
+--- stap eval: $::StapScript
+--- stap_out
+create 2 in 1
+resume 2 in 1
+create 3 in 2
+yield 2 in 1
+resume 2 in 1
+resume 3 in 2
+yield 3 in 2
+yield 2 in 1
+resume 2 in 1
+resume 3 in 2
+exec
+
+--- request
+GET /lua
+--- response_body
+num: 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: coroutine.create in header_filter_by_lua
+--- config
+    location /lua {
+        echo hello;
+        header_filter_by_lua '
+            function f()
+                yield()
+            end
+
+            local c1 = coroutine.create(f)
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of header_filter_by_lua*
+
+
+
+=== TEST 17: resume coroutines from within another one that is not its parent
+--- config
+    location /t {
+        content_by_lua '
+            local print = ngx.say
+
+            local c1, c2
+
+            function f()
+                print("f 1")
+                print(coroutine.resume(c2))
+                print("f 2")
+            end
+
+            function g()
+                print("g 1")
+                -- print(coroutine.resume(c1))
+                print("g 2")
+            end
+
+            c1 = coroutine.create(f)
+            c2 = coroutine.create(g)
+
+            coroutine.resume(c1)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+f 1
+g 1
+g 2
+true
+f 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: infinite recursive calls of coroutine.resume
+--- config
+    location /t {
+        content_by_lua '
+            local print = ngx.say
+
+            local c1, c2
+
+            function f()
+                print("f 1")
+                print(coroutine.resume(c2))
+                print("f 2")
+            end
+
+            function g()
+                print("g 1")
+                print(coroutine.resume(c1))
+                print("g 2")
+            end
+
+            c1 = coroutine.create(f)
+            c2 = coroutine.create(g)
+
+            coroutine.resume(c1)
+        ';
+    }
+--- request
+GET /t
+--- stap2 eval: $::StapScript
+--- response_body
+f 1
+g 1
+falsecannot resume normal coroutine
+g 2
+true
+f 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: resume running (entry) coroutines
+--- config
+    location /t {
+        content_by_lua '
+            ngx.say(coroutine.status(coroutine.running()))
+            ngx.say(coroutine.resume(coroutine.running()))
+        ';
+    }
+--- request
+GET /t
+--- response_body
+running
+falsecannot resume running coroutine
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: resume running (user) coroutines
+--- config
+    location /t {
+        content_by_lua '
+            local co
+            function f()
+                ngx.say("f: ", coroutine.status(co))
+                ngx.say("f: ", coroutine.resume(co))
+            end
+            co = coroutine.create(f)
+            ngx.say("chunk: ", coroutine.status(co))
+            ngx.say("chunk: ", coroutine.resume(co))
+        ';
+    }
+--- request
+GET /t
+--- response_body
+chunk: suspended
+f: running
+f: falsecannot resume running coroutine
+chunk: true
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: user coroutine end with errors, and the parent coroutine gets the right status
+--- config
+    location /t {
+        content_by_lua '
+            local co
+            function f()
+                error("bad")
+            end
+            co = coroutine.create(f)
+            ngx.say("child: resume: ", coroutine.resume(co))
+            ngx.say("child: status: ", coroutine.status(co))
+            ngx.say("parent: status: ", coroutine.status(coroutine.running()))
+        ';
+    }
+--- request
+GET /t
+--- response_body
+child: resume: false[string "content_by_lua"]:4: bad
+child: status: dead
+parent: status: running
+--- error_log
+lua coroutine: runtime error: [string "content_by_lua"]:4: bad
+
+
+
+=== TEST 22: entry coroutine is yielded by hand and still gets the right status
+--- config
+    location /t {
+        content_by_lua '
+            local co = coroutine.running()
+            ngx.say("status: ", coroutine.status(co))
+            coroutine.yield(co)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+    }
+--- request
+GET /t
+--- response_body
+status: running
+status: running
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/092-eof.t b/debian/modules/nginx-lua/t/092-eof.t
new file mode 100644
index 0000000..f05fd63
--- /dev/null
+++ b/debian/modules/nginx-lua/t/092-eof.t
@@ -0,0 +1,84 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 6);
+
+master_on();
+workers(2);
+no_root_location();
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: 404 parallel subrequests after ngx.eof()
+--- config
+    location = /lua {
+        content_by_lua '
+            ngx.say(1)
+            ngx.eof()
+            local res1, res2 = ngx.location.capture_multi{
+                { "/bad1" },
+                { "/bad2" }
+            }
+            ngx.log(ngx.WARN, "res1: ", res1.status)
+            ngx.log(ngx.WARN, "res2: ", res2.status)
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+1
+--- no_error_log
+[alert]
+--- error_log
+res1: 404
+res2: 404
+No such file or directory
+
+
+
+=== TEST 2: parallel normal subrequests after ngx.eof()
+--- config
+    location = /t {
+        content_by_lua '
+            ngx.say(1)
+            ngx.eof()
+            local r1, r2 = ngx.location.capture_multi{
+                { "/proxy/tom" },
+                { "/proxy/jim" }
+            }
+            ngx.log(ngx.WARN, r1.body)
+            ngx.log(ngx.WARN, r2.body)
+        ';
+    }
+
+    location ~ '^/proxy/(\w+)' {
+        proxy_pass http://127.0.0.1:$server_port/hello?a=$1;
+    }
+
+    location = /hello {
+        echo_sleep 0.5;
+        echo -n "hello, $arg_a";
+    }
+--- request
+GET /t
+--- response_body
+1
+--- no_error_log
+[alert]
+[error]
+--- error_log
+hello, tom
+hello, jim
+
diff --git a/debian/modules/nginx-lua/t/093-uthread-spawn.t b/debian/modules/nginx-lua/t/093-uthread-spawn.t
new file mode 100644
index 0000000..8b281ae
--- /dev/null
+++ b/debian/modules/nginx-lua/t/093-uthread-spawn.t
@@ -0,0 +1,1675 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+worker_connections(256);
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple user thread without I/O
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: two simple user threads without I/O
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("in thread 1")
+            end
+
+            function g()
+                ngx.say("in thread 2")
+            end
+
+            ngx.say("before 1")
+            ngx.thread.spawn(f)
+            ngx.say("after 1")
+
+            ngx.say("before 2")
+            ngx.thread.spawn(g)
+            ngx.say("after 2")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+terminate 1: ok
+delete thread 2
+delete thread 3
+delete thread 1
+
+--- response_body
+before 1
+in thread 1
+after 1
+before 2
+in thread 2
+after 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: simple user thread with sleep
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before sleep")
+                ngx.sleep(0.1)
+                ngx.say("after sleep")
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+before thread create
+before sleep
+after thread create
+after sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: two simple user threads with sleep
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("1: before sleep")
+                ngx.sleep(0.2)
+                ngx.say("1: after sleep")
+            end
+
+            function g()
+                ngx.say("2: before sleep")
+                ngx.sleep(0.1)
+                ngx.say("2: after sleep")
+            end
+
+            ngx.say("1: before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("1: after thread create")
+
+            ngx.say("2: before thread create")
+            ngx.thread.spawn(g)
+            ngx.say("2: after thread create")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+delete thread 2
+
+--- response_body
+1: before thread create
+1: before sleep
+1: after thread create
+2: before thread create
+2: before sleep
+2: after thread create
+2: after sleep
+1: after sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: error in user thread
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.blah()
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: fail
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+after
+--- error_log
+lua user thread aborted: runtime error: [string "content_by_lua"]:3: attempt to call field 'blah' (a nil value)
+
+
+
+=== TEST 6: simple user threads doing a single subrequest (entry quits early)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before capture")
+                res = ngx.location.capture("/proxy")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+        ';
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello world;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+before thread create
+before capture
+after thread create
+after capture: hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: simple user threads doing a single subrequest (entry also does a subrequest and quits early)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo -n hello bar;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+before thread create
+before capture
+after thread create
+capture: hello bar
+after capture: hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: simple user threads doing a single subrequest (entry also does a subrequest and quits late)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("after capture: ", res.body)
+            end
+
+            ngx.say("before thread create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread create")
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo_sleep 0.2;
+        echo -n hello bar;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+before thread create
+before capture
+after thread create
+after capture: hello foo
+capture: hello bar
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: two simple user threads doing single subrequests (entry also does a subrequest and quits between)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("f: before capture")
+                local res = ngx.location.capture("/proxy?foo")
+                ngx.say("f: after capture: ", res.body)
+            end
+
+            function g()
+                ngx.say("g: before capture")
+                local res = ngx.location.capture("/proxy?bah")
+                ngx.say("g: after capture: ", res.body)
+            end
+
+            ngx.say("before thread 1 create")
+            ngx.thread.spawn(f)
+            ngx.say("after thread 1 create")
+
+            ngx.say("before thread 2 create")
+            ngx.thread.spawn(g)
+            ngx.say("after thread 2 create")
+
+            local res = ngx.location.capture("/proxy?bar")
+            ngx.say("capture: ", res.body)
+        ';
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$server_port/$args;
+    }
+
+    location /foo {
+        echo_sleep 0.1;
+        echo -n hello foo;
+    }
+
+    location /bar {
+        echo_sleep 0.2;
+        echo -n hello bar;
+    }
+
+    location /bah {
+        echo_sleep 0.3;
+        echo -n hello bah;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before thread 1 create
+f: before capture
+after thread 1 create
+before thread 2 create
+g: before capture
+after thread 2 create
+f: after capture: hello foo
+capture: hello bar
+g: after capture: hello bah
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: nested user threads
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            ngx.thread.spawn(f)
+            ngx.say("after f")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 3
+delete thread 2
+
+--- response_body
+before f
+before g
+hello in g()
+after f
+after g
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: nested user threads (with I/O)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.sleep(0.1)
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            ngx.thread.spawn(f)
+            ngx.say("after f")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+before f
+before g
+after f
+after g
+hello in g()
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: coroutine status of a running user thread
+--- config
+    location /lua {
+        content_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+                ngx.sleep(0.1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+status: running
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: coroutine status of a dead user thread
+--- config
+    location /lua {
+        content_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+status: zombie
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: coroutine status of a "normal" user thread
+--- config
+    location /lua {
+        content_by_lua '
+            local co
+            function f()
+                co = coroutine.running()
+                local co2 = coroutine.create(g)
+                coroutine.resume(co2)
+            end
+
+            function g()
+                ngx.sleep(0.1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("status: ", coroutine.status(co))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 2
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+terminate 2: ok
+delete thread 2
+
+--- response_body
+status: normal
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: creating user threads in a user coroutine
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("before g")
+                ngx.thread.spawn(g)
+                ngx.say("after g")
+            end
+
+            function g()
+                ngx.say("hello in g()")
+            end
+
+            ngx.say("before f")
+            local co = coroutine.create(f)
+            coroutine.resume(co)
+            ngx.say("after f")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+terminate 2: ok
+delete thread 3
+terminate 1: ok
+delete thread 1
+
+--- response_body
+before f
+before g
+hello in g()
+after g
+after f
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: manual time slicing between a user thread and the entry thread
+--- config
+    location /lua {
+        content_by_lua '
+            local yield = coroutine.yield
+
+            function f()
+                local self = coroutine.running()
+                ngx.say("f 1")
+                yield(self)
+                ngx.say("f 2")
+                yield(self)
+                ngx.say("f 3")
+            end
+
+            local self = coroutine.running()
+            ngx.say("0")
+            yield(self)
+            ngx.say("1")
+            ngx.thread.spawn(f)
+            ngx.say("2")
+            yield(self)
+            ngx.say("3")
+            yield(self)
+            ngx.say("4")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+0
+1
+f 1
+2
+f 2
+3
+f 3
+4
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: manual time slicing between two user threads
+--- config
+    location /lua {
+        content_by_lua '
+            local yield = coroutine.yield
+
+            function f()
+                local self = coroutine.running()
+                ngx.say("f 1")
+                yield(self)
+                ngx.say("f 2")
+                yield(self)
+                ngx.say("f 3")
+            end
+
+            function g()
+                local self = coroutine.running()
+                ngx.say("g 1")
+                yield(self)
+                ngx.say("g 2")
+                yield(self)
+                ngx.say("g 3")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+
+--- response_body
+f 1
+g 1
+f 2
+done
+g 2
+f 3
+g 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: entry thread and a user thread flushing at the same time
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                coroutine.yield(coroutine.running)
+                ngx.flush(true)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.flush(true)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: two user threads flushing at the same time
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello from f")
+                ngx.flush(true)
+            end
+
+            function g()
+                ngx.say("hello from g")
+                ngx.flush(true)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3|create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+terminate 1: ok
+delete thread 2
+delete thread 3
+delete thread 1)$
+
+--- response_body
+hello from f
+hello from g
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: user threads + ngx.socket.tcp
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+                local bytes, err = sock:send("flush_all\\r\\n")
+                if not bytes then
+                    ngx.say("failed to send query: ", err)
+                    return
+                end
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+before
+after
+received: OK
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: user threads + ngx.socket.udp
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                local sock = ngx.socket.udp()
+                local ok, err = sock:setpeername("127.0.0.1", 12345)
+                local bytes, err = sock:send("blah")
+                if not bytes then
+                    ngx.say("failed to send query: ", err)
+                    return
+                end
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+|create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+)$
+
+--- udp_listen: 12345
+--- udp_query: blah
+--- udp_reply: hello udp
+--- response_body_like chop
+^(?:before
+after
+received: hello udp
+|before
+received: hello udp
+after)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 22: simple user thread with ngx.req.read_body()
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.req.read_body()
+                local body = ngx.req.get_body_data()
+                ngx.say("body: ", body)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+POST /lua
+hello world
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1|create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2)$
+
+--- response_body_like chop
+^(?:before
+body: hello world
+after|before
+after
+body: hello world)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: simple user thread with ngx.req.socket()
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                local sock = ngx.req.socket()
+                local body, err = sock:receive(11)
+                if not body then
+                    ngx.say("failed to read body: ", err)
+                    return
+                end
+
+                ngx.say("body: ", body)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+POST /lua
+hello world
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^(?:create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1|create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2)$
+
+--- response_body_like chop
+^(?:before
+body: hello world
+after|before
+after
+body: hello world)$
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 24: simple user thread with args
+--- config
+    location /lua {
+        content_by_lua '
+            function f(a, b)
+                ngx.say("hello ", a, " and ", b)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f, "foo", 3.14)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+before
+hello foo and 3.14
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 25: multiple user threads + subrequests returning 404 immediately
+--- config
+    location /t {
+        content_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 2 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+    }
+
+    location ~ ^/proxy/(\d+) {
+        return 404;
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval
+"$::GCScript"
+.
+'
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+'
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+finalize request /t: rc:-4 c:4 a:1
+finalize request /proxy/1: rc:404 c:3 a:0
+post subreq: /proxy/1 rc=404, status=0 a=0
+subrequest /proxy/1 done
+terminate 2: ok
+delete thread 2
+finalize request /proxy/2: rc:404 c:2 a:0
+post subreq: /proxy/2 rc=404, status=0 a=0
+subrequest /proxy/2 done
+terminate 3: ok
+delete thread 3
+finalize request /t: rc:0 c:1 a:1
+(?:finalize request /t: rc:0 c:1 a:1)?$
+
+--- response_body
+ok
+status: 404
+status: 404
+--- no_error_log
+[error]
+--- timeout: 3
+
+
+
+=== TEST 26: multiple user threads + subrequests returning 404 remotely (no wait)
+--- config
+    location /t {
+        content_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 5 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+    }
+
+    location ~ ^/proxy/(\d+) {
+        proxy_pass http://127.0.0.1:$server_port/d/$1;
+    }
+
+    location /d {
+        return 404;
+        #echo $uri;
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+create 4 in 1
+spawn user thread 4 in 1
+create 5 in 1
+spawn user thread 5 in 1
+create 6 in 1
+spawn user thread 6 in 1
+terminate 1: ok
+delete thread 1
+(?:terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+terminate 5: ok
+delete thread 5
+terminate 6: ok
+delete thread 6
+|terminate 6: ok
+delete thread 6
+terminate 5: ok
+delete thread 5
+terminate 4: ok
+delete thread 4
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+delete thread 2)$
+
+--- response_body
+ok
+status: 404
+status: 404
+status: 404
+status: 404
+status: 404
+--- no_error_log
+[error]
+--- timeout: 6
+
+
+
+=== TEST 27: multiple user threads + subrequests returning 201 immediately
+--- config
+    location /t {
+        content_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 2 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+    }
+
+    location ~ ^/proxy/(\d+) {
+        content_by_lua 'ngx.exit(201)';
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval
+"$::GCScript"
+.
+'
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+'
+
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+finalize request /t: rc:-4 c:4 a:1
+terminate 4: ok
+delete thread 4
+finalize request /proxy/1: rc:201 c:3 a:0
+post subreq: /proxy/1 rc=201, status=201 a=0
+subrequest /proxy/1 done
+terminate 2: ok
+delete thread 2
+terminate 5: ok
+delete thread 5
+finalize request /proxy/2: rc:201 c:2 a:0
+post subreq: /proxy/2 rc=201, status=201 a=0
+subrequest /proxy/2 done
+terminate 3: ok
+delete thread 3
+finalize request /t: rc:0 c:1 a:1
+(?:finalize request /t: rc:0 c:1 a:1)?$
+
+--- response_body
+ok
+status: 201
+status: 201
+--- no_error_log
+[error]
+--- timeout: 3
+
+
+
+=== TEST 28: multiple user threads + subrequests returning 204 immediately
+--- config
+    location /t {
+        content_by_lua '
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                ngx.say("status: ", res.status)
+            end
+
+            local threads = {}
+            for i = 1, 2 do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            ngx.say("ok")
+        ';
+    }
+
+    location ~ ^/proxy/(\d+) {
+        content_by_lua 'ngx.exit(204)';
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap eval
+"$::GCScript"
+.
+'
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+'
+--- stap_out_like chop
+^create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+finalize request /t: rc:-4 c:4 a:1
+terminate 4: ok
+delete thread 4
+finalize request /proxy/1: rc:204 c:3 a:0
+post subreq: /proxy/1 rc=204, status=204 a=0
+subrequest /proxy/1 done
+terminate 2: ok
+delete thread 2
+terminate 5: ok
+delete thread 5
+finalize request /proxy/2: rc:204 c:2 a:0
+post subreq: /proxy/2 rc=204, status=204 a=0
+subrequest /proxy/2 done
+terminate 3: ok
+delete thread 3
+finalize request /t: rc:0 c:1 a:1
+(?:finalize request /t: rc:0 c:1 a:1)?$
+
+--- response_body
+ok
+status: 204
+status: 204
+--- no_error_log
+[error]
+--- timeout: 3
+
+
+
+=== TEST 29: multiple user threads + subrequests returning 404 remotely (wait)
+--- config
+    location /t {
+        content_by_lua '
+            local n = 5
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                return res.status
+            end
+
+            local threads = {}
+            for i = 1, n do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            for i = 1, n do
+                local ok, res = ngx.thread.wait(threads[i])
+                ngx.say(i, ": ", res)
+            end
+
+            ngx.say("ok")
+        ';
+    }
+
+    location ~ ^/proxy/(\d+) {
+        proxy_pass http://127.0.0.1:$server_port/d/$1;
+    }
+
+    location /d {
+        return 404;
+        #echo $uri;
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap3 eval: $::GCScript
+--- stap_out3
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+create 4 in 1
+spawn user thread 4 in 1
+create 5 in 1
+spawn user thread 5 in 1
+create 6 in 1
+spawn user thread 6 in 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+terminate 5: ok
+delete thread 5
+terminate 6: ok
+delete thread 6
+terminate 1: ok
+delete thread 1
+
+--- response_body
+1: 404
+2: 404
+3: 404
+4: 404
+5: 404
+ok
+--- no_error_log
+[error]
+--- timeout: 6
+
+
+
+=== TEST 30: multiple user threads + subrequests remotely (wait)
+--- config
+    location /t {
+        content_by_lua '
+            local n = 20
+            local capture = ngx.location.capture
+            local insert = table.insert
+
+            local function f(i)
+                local res = capture("/proxy/" .. i)
+                return res.status
+            end
+
+            local threads = {}
+            for i = 1, n do
+                local co = ngx.thread.spawn(f, i)
+                insert(threads, co)
+            end
+
+            for i = 1, n do
+                local ok, res = ngx.thread.wait(threads[i])
+                ngx.say(i, ": ", res)
+            end
+
+            ngx.say("ok")
+        ';
+    }
+
+    location ~ ^/proxy/(\d+) {
+        proxy_pass http://127.0.0.1:$server_port/d/$1;
+    }
+
+    location /d {
+        echo_sleep 0.001;
+        echo $uri;
+    }
+--- request
+    GET /t
+--- stap2 eval: $::StapScript
+--- stap3 eval: $::GCScript
+--- stap_out3
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+create 4 in 1
+spawn user thread 4 in 1
+create 5 in 1
+spawn user thread 5 in 1
+create 6 in 1
+spawn user thread 6 in 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 4: ok
+delete thread 4
+terminate 5: ok
+delete thread 5
+terminate 6: ok
+delete thread 6
+terminate 1: ok
+delete thread 1
+
+--- response_body
+1: 200
+2: 200
+3: 200
+4: 200
+5: 200
+6: 200
+7: 200
+8: 200
+9: 200
+10: 200
+11: 200
+12: 200
+13: 200
+14: 200
+15: 200
+16: 200
+17: 200
+18: 200
+19: 200
+20: 200
+ok
+--- no_error_log
+[error]
+[alert]
+--- timeout: 10
+
+
+
+=== TEST 31: simple user thread without I/O
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f")
+            end
+
+            ngx.thread.spawn(f)
+            collectgarbage()
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+f
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/094-uthread-exit.t b/debian/modules/nginx-lua/t/094-uthread-exit.t
new file mode 100644
index 0000000..fe8f5ee
--- /dev/null
+++ b/debian/modules/nginx-lua/t/094-uthread-exit.t
@@ -0,0 +1,1644 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: exit in user thread (entry thread is still pending to run)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+M(timer-add) {
+    if ($arg2 == 1000) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+before
+hello in thread
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: exit in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: exit in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f")
+                ngx.exit(0)
+            end
+
+            function g()
+                ngx.sleep(1)
+                ngx.say("g")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+free request
+
+--- response_body
+end
+f
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: exit in user thread (entry already quits)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("exiting the user thread")
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+before
+after
+exiting the user thread
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
+--- config
+    location /lua {
+        resolver www.google.com;
+        resolver_timeout 12s;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+            local ok, err = sock:connect("www.google.com", 80)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+F(ngx_resolve_name) {
+    printf("resolving %s\n", user_string_n($ctx->name->data, $ctx->name->len))
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_resolve_cleanup) {
+    println("lua tcp resolve cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+resolving www.google.com
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp resolve cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
+--- config
+    location /lua {
+        resolver www.google.com;
+        resolver_timeout 12s;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("www.google.com", 80)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+F(ngx_resolve_name) {
+    printf("resolving %s\n", user_string_n($ctx->name->data, $ctx->name->len))
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_udp_resolve_cleanup) {
+    println("lua udp resolve cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+resolving www.google.com
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua udp resolve cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: exit in user thread (entry thread is still pending on tcpsock:connect)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+            sock:settimeout(12000)
+            local ok, err = sock:connect("8.8.4.4", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 12000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: exit in user thread (entry thread is still pending on tcpsock:receive)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes, ok = sock:send("blpop not_exists 2\\r\\n")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: exit in user thread (entry thread is still pending on tcpsock:receiveuntil's iterator)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.tcp()
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local bytes, ok = sock:send("blpop not_exists 2\\r\\n")
+            if not bytes then
+                ngx.say("failed to send: ", err)
+                return
+            end
+
+            local it, err = sock:receiveuntil("\\r\\n")
+            if not it then
+                ngx.say("failed to receive until: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = it()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: exit in user thread (entry thread is still pending on udpsock:receive)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.socket.udp()
+
+            local ok, err = sock:setpeername("8.8.8.8", 12345)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive()
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_udp_socket_cleanup) {
+    println("lua udp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua udp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: exit in user thread (entry thread is still pending on reqsock:receive)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+            local sock = ngx.req.socket()
+
+            sock:settimeout(12000)
+
+            local data, err = sock:receive(1024)
+            if not data then
+                ngx.say("failed to receive: ", err)
+                return
+            end
+
+            ngx.say("end")
+        ';
+    }
+--- request
+POST /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_tcp_socket_cleanup) {
+    println("lua tcp socket cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua tcp socket cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: exit in user thread (entry thread is still pending on ngx.req.read_body)
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.req.read_body()
+
+            ngx.say("end")
+        ';
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 12000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 12000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_req_body_cleanup) {
+    println("lua req body cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 12000
+expire timer 100
+terminate 2: ok
+lua req body cleanup
+delete timer 12000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+before
+hello in thread
+after
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: exit(0) in user thread (entry thread is still pending on ngx.location.capture), with pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("end")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+terminate 1: ok
+delete thread 2
+delete thread 1
+free request
+
+--- ignore_response
+--- error_log
+attempt to abort with pending subrequests
+--- no_error_log
+[alert]
+[warn]
+
+
+
+=== TEST 14: exit in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 15: exit in user thread (entry thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exit(0)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture_multi{
+                {"/echo"},
+                {"/sleep"}
+            }
+            ngx.say("end")
+        ';
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 16: exit in entry thread (user thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.location.capture_multi{
+                    {"/echo"},
+                    {"/sleep"}
+                }
+                ngx.say("end")
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.sleep(0.1)
+            ngx.exit(0)
+        ';
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 1: fail
+delete thread 2
+delete thread 1
+delete timer 200
+free request
+
+--- ignore_response
+--- error_log
+attempt to abort with pending subrequests
+--- no_error_log
+[alert]
+[warn]
+
+
+
+=== TEST 17: exit(444) in user thread (entry thread is still pending on ngx.location.capture), with pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(444)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("end")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: ok
+delete thread 2
+delete thread 1
+delete timer 200
+free request
+
+--- ignore_response
+--- no_error_log
+[alert]
+[error]
+[warn]
+
+
+
+=== TEST 18: exit(408) in user thread (entry thread is still pending on ngx.location.capture), with pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(408)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("end")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: ok
+delete thread 2
+delete thread 1
+delete timer 200
+free request
+
+--- ignore_response
+--- no_error_log
+[alert]
+[error]
+[warn]
+
+
+
+=== TEST 19: exit(499) in user thread (entry thread is still pending on ngx.location.capture), with pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                ngx.sleep(0.1)
+                ngx.exit(499)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f)
+            ngx.say("after")
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("end")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: ok
+delete thread 2
+delete thread 1
+delete timer 200
+free request
+
+--- ignore_response
+--- no_error_log
+[alert]
+[error]
+[warn]
+
diff --git a/debian/modules/nginx-lua/t/095-uthread-exec.t b/debian/modules/nginx-lua/t/095-uthread-exec.t
new file mode 100644
index 0000000..1a28861
--- /dev/null
+++ b/debian/modules/nginx-lua/t/095-uthread-exec.t
@@ -0,0 +1,428 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: exec in user thread (entry still pending)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("hello")
+        ';
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: exec in user thread (entry already quits)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+        ';
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: exec in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+        ';
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: exec in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            function g()
+                ngx.sleep(1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: exec in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.exec("/foo")
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+
+    location = /foo {
+        echo hello world;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+terminate 1: ok
+delete thread 2
+delete thread 1
+free request
+
+--- wait: 0.1
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 6: exec in entry thread (user thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.location.capture("/sleep")
+                ngx.say("end")
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.sleep(0.1)
+            ngx.exec("/foo")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+
+    location = /foo {
+        echo hello world;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 1: fail
+delete thread 2
+delete thread 1
+delete timer 200
+free request
+
+--- ignore_response
+--- error_log
+attempt to abort with pending subrequests
+--- no_error_log
+[alert]
+[warn]
+
diff --git a/debian/modules/nginx-lua/t/096-uthread-redirect.t b/debian/modules/nginx-lua/t/096-uthread-redirect.t
new file mode 100644
index 0000000..8a756ed
--- /dev/null
+++ b/debian/modules/nginx-lua/t/096-uthread-redirect.t
@@ -0,0 +1,282 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ngx.redirect() in user thread (entry thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.redirect(301)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture_multi{
+                {"/echo"},
+                {"/sleep"}
+            }
+            ngx.say("end")
+        ';
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
+
+
+=== TEST 2: redirect in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.redirect(301)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("end")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body_like: 302 Found
+--- error_code: 302
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: ngx.redirect() in entry thread (user thread is still pending on ngx.location.capture_multi), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        content_by_lua '
+            function f()
+                ngx.location.capture_multi{
+                    {"/echo"},
+                    {"/sleep"}
+                }
+                ngx.say("end")
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.sleep(0.1)
+            ngx.redirect(301)
+        ';
+    }
+
+    location = /echo {
+        echo hello;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+post subreq /echo
+add timer 200
+expire timer 100
+terminate 1: fail
+delete thread 2
+delete thread 1
+delete timer 200
+free request
+
+--- ignore_response
+--- error_log
+attempt to abort with pending subrequests
+--- no_error_log
+[alert]
+[warn]
+
diff --git a/debian/modules/nginx-lua/t/097-uthread-rewrite.t b/debian/modules/nginx-lua/t/097-uthread-rewrite.t
new file mode 100644
index 0000000..bb3b724
--- /dev/null
+++ b/debian/modules/nginx-lua/t/097-uthread-rewrite.t
@@ -0,0 +1,353 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: rewrite in user thread (entry still pending)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.req.set_uri("/foo", true)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+            ngx.say("hello")
+        ';
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: rewrite in user thread (entry already quits)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.req.set_uri("/foo", true)
+            end
+
+            ngx.thread.spawn(f)
+        ';
+    }
+
+    location /foo {
+        echo i am foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+i am foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: rewrite in user thread (entry thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.req.set_uri("/foo", true)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.sleep(1)
+        ';
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 1000
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 1
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: rewrite in a user thread (another user thread is still pending on ngx.sleep)
+--- config
+    location /lua {
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.req.set_uri("/foo", true)
+            end
+
+            function g()
+                ngx.sleep(1)
+            end
+
+            ngx.thread.spawn(f)
+            ngx.thread.spawn(g)
+        ';
+    }
+
+    location = /foo {
+        echo hello foo;
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 1000 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+    /*
+    if (tm == 1000) {
+        print_ubacktrace()
+    }
+    */
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 1000 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_sleep_cleanup) {
+    println("lua sleep cleanup")
+}
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+create 3 in 1
+spawn user thread 3 in 1
+add timer 1000
+terminate 1: ok
+delete thread 1
+expire timer 100
+terminate 2: ok
+lua sleep cleanup
+delete timer 1000
+delete thread 2
+delete thread 3
+free request
+
+--- response_body
+hello foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: rewrite in user thread (entry thread is still pending on ngx.location.capture), without pending output
+--- config
+    location /lua {
+        client_body_timeout 12000ms;
+        rewrite_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.req.set_uri("/foo", true)
+            end
+
+            ngx.thread.spawn(f)
+
+            ngx.location.capture("/sleep")
+            ngx.say("end")
+        ';
+        content_by_lua return;
+    }
+
+    location = /sleep {
+        echo_sleep 0.2;
+    }
+
+    location = /foo {
+        echo hello world;
+    }
+--- request
+POST /lua
+--- more_headers
+Content-Length: 1024
+--- stap2 eval: $::StapScript
+--- stap eval
+<<'_EOC_' . $::GCScript;
+
+global timers
+
+F(ngx_http_free_request) {
+    println("free request")
+}
+
+M(timer-add) {
+    if ($arg2 == 200 || $arg2 == 100) {
+        timers[$arg1] = $arg2
+        printf("add timer %d\n", $arg2)
+    }
+}
+
+M(timer-del) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("delete timer %d\n", tm)
+        delete timers[$arg1]
+    }
+}
+
+M(timer-expire) {
+    tm = timers[$arg1]
+    if (tm == 200 || tm == 100) {
+        printf("expire timer %d\n", timers[$arg1])
+        delete timers[$arg1]
+    }
+}
+
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq %s\n", ngx_http_req_uri($r))
+}
+
+_EOC_
+
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+add timer 100
+add timer 200
+expire timer 100
+terminate 2: fail
+expire timer 200
+post subreq /sleep
+terminate 1: ok
+delete thread 2
+delete thread 1
+terminate 3: ok
+delete thread 3
+free request
+
+--- response_body
+end
+--- error_log
+attempt to abort with pending subrequests
+
diff --git a/debian/modules/nginx-lua/t/098-uthread-wait.t b/debian/modules/nginx-lua/t/098-uthread-wait.t
new file mode 100644
index 0000000..8155653
--- /dev/null
+++ b/debian/modules/nginx-lua/t/098-uthread-wait.t
@@ -0,0 +1,1225 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = $t::StapThread::GCScript;
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple user thread wait without I/O
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                return "done"
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("thread created: ", coroutine.status(t))
+
+            collectgarbage()
+
+            local ok, res = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to run thread: ", res)
+                return
+            end
+
+            ngx.say(res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+hello in thread
+thread created: zombie
+done
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: simple user thread wait with I/O
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("hello in thread")
+                return "done"
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("thread created: ", coroutine.status(t))
+
+            local ok, res = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to wait thread: ", res)
+                return
+            end
+
+            ngx.say(res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+thread created: running
+hello in thread
+done
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: wait on uthreads on the reversed order of their termination
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f: hello")
+                return "done"
+            end
+
+            function g()
+                ngx.sleep(0.2)
+                ngx.say("g: hello")
+                return "done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("f thread created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("g thread created: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tg)
+            if not ok then
+                ngx.say("failed to wait g: ", res)
+                return
+            end
+
+            ngx.say("g: ", res)
+
+            ngx.say("f thread status: ", coroutine.status(tf))
+
+            ok, res = ngx.thread.wait(tf)
+            if not ok then
+                ngx.say("failed to wait f: ", res)
+                return
+            end
+
+            ngx.say("f: ", res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+terminate 3: ok
+delete thread 3
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+f thread created: running
+g thread created: running
+f: hello
+g: hello
+g: done
+f thread status: zombie
+f: done
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: wait on uthreads on the exact order of their termination
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f: hello")
+                return "done"
+            end
+
+            function g()
+                ngx.sleep(0.2)
+                ngx.say("g: hello")
+                return "done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("f thread created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("g thread created: ", coroutine.status(tg))
+
+            ok, res = ngx.thread.wait(tf)
+            if not ok then
+                ngx.say("failed to wait f: ", res)
+                return
+            end
+
+            ngx.say("f: ", res)
+
+            ngx.say("g thread status: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tg)
+            if not ok then
+                ngx.say("failed to wait g: ", res)
+                return
+            end
+
+            ngx.say("g: ", res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+terminate 1: ok
+delete thread 1
+
+--- wait: 0.1
+--- response_body
+f thread created: running
+g thread created: running
+f: hello
+f: done
+g thread status: running
+g: hello
+g: done
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: simple user thread wait without I/O (return multiple values)
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                return "done", 3.14
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("thread created: ", coroutine.status(t))
+
+            collectgarbage()
+
+            local ok, res1, res2 = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to run thread: ", res1)
+                return
+            end
+
+            ngx.say("res: ", res1, " ", res2)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+hello in thread
+thread created: zombie
+res: done 3.14
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: simple user thread wait with I/O, return multiple values
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("hello in thread")
+                return "done", 3.14
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("thread created: ", coroutine.status(t))
+
+            local ok, res1, res2 = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to wait thread: ", res1)
+                return
+            end
+
+            ngx.say("res: ", res1, " ", res2)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+thread created: running
+hello in thread
+res: done 3.14
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: simple user thread wait without I/O, throw errors
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.say("hello in thread")
+                error("bad bad!")
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("thread created: ", coroutine.status(t))
+
+            collectgarbage()
+
+            local ok, res = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to wait thread: ", res)
+                return
+            end
+
+            ngx.say(res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: fail
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+hello in thread
+thread created: zombie
+failed to wait thread: bad bad!
+--- error_log
+lua user thread aborted: runtime error: [string "content_by_lua"]:4: bad bad!
+
+
+
+=== TEST 8: simple user thread wait with I/O, throw errors
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("hello in thread")
+                error("bad bad!")
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("thread created: ", coroutine.status(t))
+
+            collectgarbage()
+
+            local ok, res = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to wait thread: ", res)
+                return
+            end
+
+            ngx.say(res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: fail
+delete thread 2
+terminate 1: ok
+delete thread 1
+
+--- response_body
+thread created: running
+hello in thread
+failed to wait thread: bad bad!
+--- error_log
+lua user thread aborted: runtime error: [string "content_by_lua"]:5: bad bad!
+
+
+
+=== TEST 9: simple user thread wait without I/O (in a user coroutine)
+--- config
+    location /lua {
+        content_by_lua '
+            function g()
+                ngx.say("hello in thread")
+                return "done"
+            end
+
+            function f()
+                local t, err = ngx.thread.spawn(g)
+                if not t then
+                    ngx.say("failed to spawn thread: ", err)
+                    return
+                end
+
+                ngx.say("thread created: ", coroutine.status(t))
+
+                collectgarbage()
+
+                local ok, res = ngx.thread.wait(t)
+                if not ok then
+                    ngx.say("failed to run thread: ", res)
+                    return
+                end
+
+                ngx.say(res)
+            end
+
+            local co = coroutine.create(f)
+            coroutine.resume(co)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+terminate 1: ok
+delete thread 1
+
+--- response_body
+hello in thread
+thread created: zombie
+done
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: simple user thread wait with I/O (in a user coroutine)
+--- config
+    location /lua {
+        content_by_lua '
+            function g()
+                ngx.sleep(0.1)
+                ngx.say("hello in thread")
+                return "done"
+            end
+
+            function f()
+                local t, err = ngx.thread.spawn(g)
+                if not t then
+                    ngx.say("failed to spawn thread: ", err)
+                    return
+                end
+
+                ngx.say("thread created: ", coroutine.status(t))
+
+                collectgarbage()
+
+                local ok, res = ngx.thread.wait(t)
+                if not ok then
+                    ngx.say("failed to run thread: ", res)
+                    return
+                end
+
+                ngx.say(res)
+            end
+
+            local co = coroutine.create(f)
+            coroutine.resume(co)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 3: ok
+delete thread 3
+terminate 2: ok
+terminate 1: ok
+delete thread 1
+
+--- response_body
+thread created: running
+hello in thread
+done
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: waiting on two simple user threads without I/O
+--- config
+    location /lua {
+        content_by_lua '
+            -- local out = function (...) ngx.log(ngx.ERR, ...) end
+            local out = ngx.say
+
+            function f()
+                out("f: hello")
+                return "f done"
+            end
+
+            function g()
+                out("g: hello")
+                return "g done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                out("failed to spawn thread f: ", err)
+                return
+            end
+
+            out("thread f created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                out("failed to spawn thread g: ", err)
+                return
+            end
+
+            out("thread g created: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                out("failed to wait thread: ", res)
+                return
+            end
+
+            out("res: ", res)
+
+            out("f status: ", coroutine.status(tf))
+            out("g status: ", coroutine.status(tg))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+delete thread 2
+terminate 1: ok
+delete thread 3
+delete thread 1
+
+--- response_body
+f: hello
+thread f created: zombie
+g: hello
+thread g created: zombie
+res: f done
+f status: dead
+g status: zombie
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: waiting on two simple user threads with I/O
+--- config
+    location /lua {
+        content_by_lua '
+            -- local out = function (...) ngx.log(ngx.ERR, ...) end
+            local out = ngx.say
+
+            function f()
+                ngx.sleep(0.1)
+                out("f: hello")
+                return "f done"
+            end
+
+            function g()
+                ngx.sleep(0.2)
+                out("g: hello")
+                return "g done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                out("failed to spawn thread f: ", err)
+                return
+            end
+
+            out("thread f created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                out("failed to spawn thread g: ", err)
+                return
+            end
+
+            out("thread g created: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                out("failed to wait thread: ", res)
+                return
+            end
+
+            out("res: ", res)
+
+            out("f status: ", coroutine.status(tf))
+            out("g status: ", coroutine.status(tg))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+delete thread 2
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+
+--- response_body
+thread f created: running
+thread g created: running
+f: hello
+res: f done
+f status: dead
+g status: running
+g: hello
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: waiting on two simple user threads with I/O (uthreads completed in reversed order)
+--- config
+    location /lua {
+        content_by_lua '
+            -- local out = function (...) ngx.log(ngx.ERR, ...) end
+            local out = ngx.say
+
+            function f()
+                ngx.sleep(0.2)
+                out("f: hello")
+                return "f done"
+            end
+
+            function g()
+                ngx.sleep(0.1)
+                out("g: hello")
+                return "g done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                out("failed to spawn thread f: ", err)
+                return
+            end
+
+            out("thread f created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                out("failed to spawn thread g: ", err)
+                return
+            end
+
+            out("thread g created: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                out("failed to wait thread: ", res)
+                return
+            end
+
+            out("res: ", res)
+
+            out("f status: ", coroutine.status(tf))
+            out("g status: ", coroutine.status(tg))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+delete thread 3
+terminate 1: ok
+delete thread 1
+terminate 2: ok
+delete thread 2
+
+--- response_body
+thread f created: running
+thread g created: running
+g: hello
+res: g done
+f status: running
+g status: dead
+f: hello
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: waiting on two simple user threads without I/O, both aborted by errors
+--- config
+    location /lua {
+        content_by_lua '
+            -- local out = function (...) ngx.log(ngx.ERR, ...) end
+            local out = ngx.say
+
+            function f()
+                out("f: hello")
+                error("f done")
+            end
+
+            function g()
+                out("g: hello")
+                error("g done")
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                out("failed to spawn thread f: ", err)
+                return
+            end
+
+            out("thread f created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                out("failed to spawn thread g: ", err)
+                return
+            end
+
+            out("thread g created: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                out("failed to wait thread: ", res)
+            else
+                out("res: ", res)
+            end
+
+            out("f status: ", coroutine.status(tf))
+            out("g status: ", coroutine.status(tg))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: fail
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: fail
+delete thread 2
+terminate 1: ok
+delete thread 3
+delete thread 1
+
+--- response_body
+f: hello
+thread f created: zombie
+g: hello
+thread g created: zombie
+failed to wait thread: f done
+f status: dead
+g status: zombie
+
+--- error_log
+lua user thread aborted: runtime error: [string "content_by_lua"]:7: f done
+
+
+
+=== TEST 15: waiting on two simple user threads with I/O, both aborted by errors
+--- config
+    location /lua {
+        content_by_lua '
+            -- local out = function (...) ngx.log(ngx.ERR, ...) end
+            local out = ngx.say
+
+            function f()
+                ngx.sleep(0.1)
+                out("f: hello")
+                error("f done")
+            end
+
+            function g()
+                ngx.sleep(0.2)
+                out("g: hello")
+                error("g done")
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                out("failed to spawn thread f: ", err)
+                return
+            end
+
+            out("thread f created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                out("failed to spawn thread g: ", err)
+                return
+            end
+
+            out("thread g created: ", coroutine.status(tg))
+
+            local ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                out("failed to wait thread: ", res)
+            else
+                out("res: ", res)
+            end
+
+            out("f status: ", coroutine.status(tf))
+            out("g status: ", coroutine.status(tg))
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: fail
+delete thread 2
+terminate 1: ok
+delete thread 1
+terminate 3: fail
+delete thread 3
+
+--- response_body
+thread f created: running
+thread g created: running
+f: hello
+failed to wait thread: f done
+f status: dead
+g status: running
+g: hello
+
+--- error_log
+lua user thread aborted: runtime error: [string "content_by_lua"]:8: f done
+
+
+
+=== TEST 16: wait on uthreads on the exact order of their termination, but exit the world early
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                ngx.say("f: hello")
+                return "done"
+            end
+
+            function g()
+                ngx.sleep(0.2)
+                ngx.say("g: hello")
+                return "done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("f thread created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                ngx.say("failed to spawn thread: ", err)
+                return
+            end
+
+            ngx.say("g thread created: ", coroutine.status(tg))
+
+            ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                ngx.say("failed to wait: ", res)
+                return
+            end
+
+            ngx.say("res: ", res)
+
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 2: ok
+delete thread 2
+terminate 1: ok
+delete thread 3
+delete thread 1
+
+--- response_body
+f thread created: running
+g thread created: running
+f: hello
+res: done
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: wait on uthreads on the reversed order of their termination, but exit the world early
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.2)
+                ngx.say("f: hello")
+                return "f done"
+            end
+
+            function g()
+                ngx.sleep(0.1)
+                ngx.say("g: hello")
+                return "g done"
+            end
+
+            local tf, err = ngx.thread.spawn(f)
+            if not tf then
+                ngx.say("failed to spawn thread f: ", err)
+                return
+            end
+
+            ngx.say("f thread created: ", coroutine.status(tf))
+
+            local tg, err = ngx.thread.spawn(g)
+            if not tg then
+                ngx.say("failed to spawn thread g: ", err)
+                return
+            end
+
+            ngx.say("g thread created: ", coroutine.status(tg))
+
+            ok, res = ngx.thread.wait(tf, tg)
+            if not ok then
+                ngx.say("failed to wait: ", res)
+                return
+            end
+
+            ngx.say("res: ", res)
+
+            ngx.exit(200)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 3: ok
+delete thread 3
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+f thread created: running
+g thread created: running
+g: hello
+res: g done
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: entry coroutine waiting on a thread not created by itself
+--- config
+    location /lua {
+        content_by_lua '
+            local t
+
+            function f()
+                ngx.sleep(0.1)
+                return "done"
+            end
+
+            function g()
+                t = ngx.thread.spawn(f)
+            end
+
+            local co = coroutine.create(g)
+            coroutine.resume(co)
+
+            local ok, res = ngx.thread.wait(t)
+            if not ok then
+                ngx.say("failed to run thread: ", res)
+                return
+            end
+
+            ngx.say(res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 2
+spawn user thread 3 in 2
+terminate 2: ok
+terminate 1: fail
+delete thread 3
+delete thread 1
+
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+only the parent coroutine can wait on the thread
+
+
+
+=== TEST 19: entry coroutine waiting on a user coroutine
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                coroutine.yield()
+                return "done"
+            end
+
+            local co = coroutine.create(f)
+            coroutine.resume(co)
+
+            local ok, res = ngx.thread.wait(co)
+            if not ok then
+                ngx.say("failed to run thread: ", res)
+                return
+            end
+
+            ngx.say(res)
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: fail
+delete thread 1
+
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+lua entry thread aborted: runtime error: [string "content_by_lua"]:11: attempt to wait on a coroutine that is not a user thread
+
+
+
+=== TEST 20: lua backtrace dumper may access dead parent coroutines
+--- config
+    location /lua {
+        content_by_lua '
+            function f()
+                ngx.sleep(0.1)
+                collectgarbage()
+                error("f done")
+            end
+
+            ngx.thread.spawn(f)
+            ngx.say("ok")
+
+            collectgarbage()
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 1: ok
+delete thread 1
+terminate 2: fail
+delete thread 2
+
+--- response_body
+ok
+
+--- error_log
+lua user thread aborted: runtime error: [string "content_by_lua"]:5: f done
+
diff --git a/debian/modules/nginx-lua/t/099-c-api.t b/debian/modules/nginx-lua/t/099-c-api.t
new file mode 100644
index 0000000..28b35ea
--- /dev/null
+++ b/debian/modules/nginx-lua/t/099-c-api.t
@@ -0,0 +1,363 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+log_level('warn');
+
+repeat_each(3);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+no_long_string();
+#master_on();
+#workers(2);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: find zone
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                void *ngx_http_lua_find_zone(char *data, size_t len);
+            ]]
+
+            local buf = ffi.new("char[?]", 4)
+            ffi.copy(buf, "foo", 3)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 3)
+            ngx.say("foo zone: ", tonumber(ffi.cast("long", zone)) ~= 0 and "defined" or "undef")
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            ngx.say("dogs zone: ", tonumber(ffi.cast("long", zone)) ~= 0 and "defined" or "undef")
+        ';
+    }
+--- request
+GET /test
+--- response_body
+foo zone: undef
+dogs zone: defined
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: number typed value
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                typedef struct {
+                    size_t  len;
+                    char   *data;
+                } ngx_str_t;
+
+                typedef struct {
+                    uint8_t         type;
+
+                    union {
+                        int         b; /* boolean */
+                        double      n; /* number */
+                        ngx_str_t   s; /* string */
+                    } value;
+
+                } ngx_http_lua_value_t;
+
+                void *ngx_http_lua_find_zone(char *data, size_t len);
+                intptr_t ngx_http_lua_shared_dict_get(void *zone, char *kdata, size_t klen, ngx_http_lua_value_t *val);
+            ]]
+
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", 1234567)
+            dogs:set("bar", 3.14159)
+
+            local buf = ffi.new("char[?]", 4)
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+
+            ffi.copy(buf, "foo", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("foo: rc=", tonumber(rc),
+                ", type=", val[0].type,
+                ", val=", tonumber(val[0].value.n))
+
+            ffi.copy(buf, "bar", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("bar: rc=", tonumber(rc),
+                ", type=", val[0].type,
+                ", val=", tonumber(val[0].value.n))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+foo: rc=0, type=3, val=1234567
+bar: rc=0, type=3, val=3.14159
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: boolean typed value
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                typedef struct {
+                    size_t  len;
+                    char   *data;
+                } ngx_str_t;
+
+                typedef struct {
+                    uint8_t         type;
+
+                    union {
+                        int         b; /* boolean */
+                        double      n; /* number */
+                        ngx_str_t   s; /* string */
+                    } value;
+
+                } ngx_http_lua_value_t;
+
+                void *ngx_http_lua_find_zone(char *data, size_t len);
+                intptr_t ngx_http_lua_shared_dict_get(void *zone, char *kdata, size_t klen, ngx_http_lua_value_t *val);
+            ]]
+
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", true)
+            dogs:set("bar", false)
+
+            local buf = ffi.new("char[?]", 4)
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+
+            ffi.copy(buf, "foo", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("foo: rc=", tonumber(rc),
+                ", type=", tonumber(val[0].type),
+                ", val=", tonumber(val[0].value.b))
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+            ffi.copy(buf, "bar", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("bar: rc=", tonumber(rc),
+                ", type=", tonumber(val[0].type),
+                ", val=", tonumber(val[0].value.b))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+foo: rc=0, type=1, val=1
+bar: rc=0, type=1, val=0
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: key not found
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                typedef struct {
+                    size_t  len;
+                    char   *data;
+                } ngx_str_t;
+
+                typedef struct {
+                    uint8_t         type;
+
+                    union {
+                        int         b; /* boolean */
+                        double      n; /* number */
+                        ngx_str_t   s; /* string */
+                    } value;
+
+                } ngx_http_lua_value_t;
+
+                void *ngx_http_lua_find_zone(char *data, size_t len);
+                intptr_t ngx_http_lua_shared_dict_get(void *zone, char *kdata, size_t klen, ngx_http_lua_value_t *val);
+            ]]
+
+            local dogs = ngx.shared.dogs
+            dogs:flush_all()
+
+            local buf = ffi.new("char[?]", 4)
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+
+            ffi.copy(buf, "foo", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("foo: rc=", tonumber(rc))
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+            ffi.copy(buf, "bar", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("bar: rc=", tonumber(rc))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+foo: rc=-5
+bar: rc=-5
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: string typed value
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                typedef struct {
+                    size_t  len;
+                    char   *data;
+                } ngx_str_t;
+
+                typedef struct {
+                    uint8_t         type;
+
+                    union {
+                        int         b; /* boolean */
+                        double      n; /* number */
+                        ngx_str_t   s; /* string */
+                    } value;
+
+                } ngx_http_lua_value_t;
+
+                void *ngx_http_lua_find_zone(char *data, size_t len);
+                intptr_t ngx_http_lua_shared_dict_get(void *zone, char *kdata, size_t klen, ngx_http_lua_value_t *val);
+            ]]
+
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", "hello world")
+            dogs:set("bar", "")
+
+            local buf = ffi.new("char[?]", 4)
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+
+            local s = ffi.new("char[?]", 20)
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+            val[0].value.s.len = 20
+            val[0].value.s.data = s
+
+            ffi.copy(buf, "foo", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("foo: rc=", tonumber(rc),
+                ", type=", tonumber(val[0].type),
+                ", val=", ffi.string(val[0].value.s.data, val[0].value.s.len),
+                ", len=", tonumber(val[0].value.s.len))
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+            val[0].value.s.len = 20
+            val[0].value.s.data = s
+
+            ffi.copy(buf, "bar", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("bar: rc=", tonumber(rc),
+                ", type=", tonumber(val[0].type),
+                ", val=", ffi.string(val[0].value.s.data, val[0].value.s.len),
+                ", len=", tonumber(val[0].value.s.len))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+foo: rc=0, type=4, val=hello world, len=11
+bar: rc=0, type=4, val=, len=0
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: nil typed value
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                typedef struct {
+                    size_t  len;
+                    char   *data;
+                } ngx_str_t;
+
+                typedef struct {
+                    uint8_t         type;
+
+                    union {
+                        int         b; /* boolean */
+                        double      n; /* number */
+                        ngx_str_t   s; /* string */
+                    } value;
+
+                } ngx_http_lua_value_t;
+
+                void *ngx_http_lua_find_zone(char *data, size_t len);
+                intptr_t ngx_http_lua_shared_dict_get(void *zone, char *kdata, size_t klen, ngx_http_lua_value_t *val);
+            ]]
+
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", nil)
+
+            local buf = ffi.new("char[?]", 4)
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+
+            local val = ffi.new("ngx_http_lua_value_t[?]", 1)
+
+            ffi.copy(buf, "foo", 3)
+            local rc = ffi.C.ngx_http_lua_shared_dict_get(zone, buf, 3, val)
+            ngx.say("foo: rc=", tonumber(rc))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+foo: rc=-5
+--- no_error_log
+[error]
+
diff --git a/debian/modules/nginx-lua/t/100-client-abort.t b/debian/modules/nginx-lua/t/100-client-abort.t
new file mode 100644
index 0000000..5d8ad87
--- /dev/null
+++ b/debian/modules/nginx-lua/t/100-client-abort.t
@@ -0,0 +1,922 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = <<_EOC_;
+$t::StapThread::GCScript
+
+F(ngx_http_lua_check_broken_connection) {
+    println("lua check broken conn")
+}
+
+F(ngx_http_lua_request_cleanup) {
+    println("lua req cleanup")
+}
+_EOC_
+
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 2: sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 3: sleep + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: subrequest + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location /sub {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 5: subrequest + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        content_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location /sub {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: fail
+lua req cleanup
+delete thread 1
+
+--- wait: 1.1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- error_log
+bad things happen
+
+
+
+=== TEST 6: subrequest + stop (proxy, ignore client abort)
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location = /sub {
+        proxy_ignore_client_abort on;
+        proxy_pass http://www.google.com:1234/;
+    }
+
+    location = /sleep {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 7: subrequest + stop (proxy, check client abort)
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.location.capture("/sub")
+            error("bad things happen")
+        ';
+    }
+
+    location = /sub {
+        proxy_ignore_client_abort off;
+        proxy_pass http://www.google.com:1234/;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 8: need body on + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        lua_need_request_body on;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 9: ngx.req.read_body + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.req.read_body()
+            ngx.sleep(1)
+        ';
+        log_by_lua '
+            ngx.log(ngx.NOTICE, "here in log by lua")
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 0.1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+here in log by lua
+
+
+
+=== TEST 10: ngx.req.socket + receive() + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive()
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 11: ngx.req.socket + receive(N) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(5)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 12: ngx.req.socket + receive(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(2)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:lua check broken conn
+terminate 1: ok
+delete thread 1
+lua req cleanup|lua check broken conn
+lua req cleanup
+delete thread 1)$
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: ngx.req.socket + m * receive(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            sock:receive(2)
+            sock:receive(2)
+            sock:receive(1)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 14: ngx.req.socket + receiveuntil + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            local it = sock:receiveuntil("\\n")
+            it()
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 15: ngx.req.socket + receiveuntil + it(n) + sleep + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            local it = sock:receiveuntil("\\n")
+            it(2)
+            it(3)
+            ngx.sleep(1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- timeout: 0.2
+--- wait: 0.1
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 16: cosocket + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.req.discard_body()
+
+            local sock, err = ngx.socket.tcp()
+            if not sock then
+                ngx.log(ngx.ERR, "failed to get socket: ", err)
+                return
+            end
+
+            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect: ", err)
+                return
+            end
+
+            local bytes, err = sock:send("blpop nonexist 2\\r\\n")
+            if not bytes then
+                ngx.log(ngx.ERR, "failed to send query: ", err)
+                return
+            end
+
+            -- ngx.log(ngx.ERR, "about to receive")
+
+            local res, err = sock:receive()
+            if not res then
+                ngx.log(ngx.ERR, "failed to receive query: ", err)
+                return
+            end
+
+            ngx.log(ngx.ERR, "res: ", res)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 17: ngx.req.socket + receive n < content-length + ignore
+--- config
+    location /t {
+        lua_check_client_abort off;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            local res, err, part = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err, ": ", part)
+                return
+            end
+            error("bad")
+        ';
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 100\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+failed to receive: client aborted: hello
+
+
+
+=== TEST 18: ngx.req.socket + receive n < content-length + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            local res, err, part = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err, ": ", part)
+                return
+            end
+            error("bad")
+        ';
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 100\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+failed to receive: client aborted: hello
+
+
+
+=== TEST 19: ngx.req.socket + receive n == content-length + stop
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            ngx.sleep(0.1)
+            error("bad")
+        ';
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+hello"
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out_like
+^(?:lua check broken conn
+terminate 1: ok
+delete thread 1
+lua req cleanup|lua check broken conn
+lua check broken conn
+lua req cleanup
+delete thread 1)$
+
+--- shutdown
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+
+
+
+=== TEST 20: ngx.req.socket + receive n == content-length + ignore
+--- config
+    location /t {
+        content_by_lua '
+            local sock = ngx.req.socket()
+            local res, err = sock:receive("*a")
+            if not res then
+                ngx.log(ngx.NOTICE, "failed to receive: ", err)
+                return
+            end
+            ngx.say("done")
+        ';
+    }
+--- raw_request eval
+"POST /t HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+hello"
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+lua req cleanup
+
+--- shutdown: 1
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 21: ngx.req.read_body + sleep + stop (log handler still gets called)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.req.read_body()
+            ngx.sleep(0.1)
+        ';
+    }
+--- request
+POST /t
+hello
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+lua check broken conn
+lua req cleanup
+delete thread 1
+
+--- shutdown: 1
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+--- SKIP
+
+
+
+=== TEST 22: exec to lua + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.exec("/t2")
+        ';
+    }
+
+    location = /t2 {
+        lua_check_client_abort off;
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+terminate 2: ok
+delete thread 2
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: exec to proxy + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.exec("/t2")
+        ';
+    }
+
+    location = /t2 {
+        proxy_ignore_client_abort on;
+        proxy_pass http://127.0.0.1:$server_port/sleep;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 24: exec (named location) to proxy + ignore
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.exec("@t2")
+        ';
+    }
+
+    location @t2 {
+        proxy_ignore_client_abort on;
+        proxy_pass http://127.0.0.1:$server_port/sleep;
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+lua req cleanup
+delete thread 1
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 25: bug in ngx_http_upstream_test_connect for kqueue
+--- config
+    location /t {
+        proxy_pass http://127.0.0.1:1234/;
+    }
+--- request
+GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+qr{connect\(\) failed \(\d+: Connection refused\) while connecting to upstream}
+--- no_error_log
+[alert]
+
+
+
+=== TEST 26: sleep (default off)
+--- config
+    location /t {
+        content_by_lua '
+            ngx.sleep(1)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+lua req cleanup
+
+--- wait: 1
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
diff --git a/debian/modules/nginx-lua/t/101-on-abort.t b/debian/modules/nginx-lua/t/101-on-abort.t
new file mode 100644
index 0000000..4d60acb
--- /dev/null
+++ b/debian/modules/nginx-lua/t/101-on-abort.t
@@ -0,0 +1,790 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use t::StapThread;
+
+our $GCScript = <<_EOC_;
+$t::StapThread::GCScript
+
+F(ngx_http_lua_check_broken_connection) {
+    println("lua check broken conn")
+}
+
+F(ngx_http_lua_request_cleanup) {
+    println("lua req cleanup")
+}
+_EOC_
+
+our $StapScript = $t::StapThread::StapScript;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 16);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
+$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
+
+#no_shuffle();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ignore the client abort event in the user callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 2: abort in the user callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 3: ngx.exit(499) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 4: ngx.exit(408) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(408)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.1
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 5: ngx.exit(-1) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(-1)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 1;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 6: ngx.exit(0) with pending subrequest
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(0)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.location.capture("/sleep")
+            ngx.log(ngx.ERR, "main handler done")
+        ';
+    }
+
+    location = /sleep {
+        echo_sleep 0.7;
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: fail
+terminate 1: ok
+delete thread 2
+delete thread 1
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.6
+--- ignore_response
+--- error_log
+client prematurely closed connection
+on abort called
+lua user thread aborted: runtime error: [string "content_by_lua"]:4: attempt to abort with pending subrequests
+main handler done
+
+
+
+=== TEST 7: accessing cosocket in callback
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+                if not ok then
+                    ngx.log(ngx.ERR, "failed to connect to redis: ", err)
+                    ngx.exit(499)
+                end
+                local bytes, err = sock:send("flushall\\r\\n")
+                if not bytes then
+                    ngx.log(ngx.ERR, "failed to send query: ", err)
+                    ngx.exit(499)
+                end
+
+                local res, err = sock:receive()
+                if not res then
+                    ngx.log(ngx.ERR, "failed to receive: ", err)
+                    ngx.exit(499)
+                end
+                ngx.log(ngx.NOTICE, "callback done: ", res)
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.2
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+callback done: +OK
+
+
+
+=== TEST 8: ignore the client abort event in the user callback (no check)
+--- config
+    location /t {
+        lua_check_client_abort off;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("cannot set on_abort: ", err)
+                return
+            end
+
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+terminate 1: ok
+delete thread 1
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- response_body
+cannot set on_abort: lua_check_client_abort is off
+--- no_error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 9: regsiter on_abort callback but no client abortion
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.say("done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: ok
+delete thread 1
+lua req cleanup
+delete thread 2
+
+--- response_body
+done
+--- no_error_log
+[error]
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 10: ignore the client abort event in the user callback (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.7)
+                ngx.log(ngx.NOTICE, "main handler done")
+            end)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+lua check broken conn
+terminate 2: ok
+delete thread 2
+terminate 3: ok
+delete thread 3
+lua req cleanup
+
+--- timeout: 0.2
+--- abort
+--- wait: 0.7
+--- ignore_response
+--- no_error_log
+[error]
+--- error_log
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 11: abort in the user callback (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.7)
+                ngx.log(ngx.NOTICE, "main handler done")
+            end)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 3
+
+--- timeout: 0.2
+--- wait: 0.1
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 12: regsiter on_abort callback but no client abortion (uthread)
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.1)
+                ngx.say("done")
+            end)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+create 3 in 1
+spawn user thread 3 in 1
+terminate 1: ok
+delete thread 1
+terminate 3: ok
+delete thread 3
+lua req cleanup
+delete thread 2
+
+--- response_body
+done
+--- no_error_log
+[error]
+client prematurely closed connection
+on abort called
+main handler done
+
+
+
+=== TEST 13: regsiter on_abort callback multiple times
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("1: cannot set on_abort: " .. err)
+                return
+            end
+
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+            end)
+
+            if not ok then
+                ngx.say("2: cannot set on_abort: " .. err)
+                return
+            end
+
+            ngx.thread.spawn(function ()
+                ngx.sleep(0.1)
+                ngx.say("done")
+            end)
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+terminate 1: ok
+delete thread 1
+lua req cleanup
+delete thread 2
+
+--- response_body
+2: cannot set on_abort: duplicate call
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: abort with 499 in the user callback, but the header is already sent
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(499)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.send_headers()
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 15: abort with 444 in the user callback, but the header is already sent
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(444)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.send_headers()
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 16: abort with 408 in the user callback, but the header is already sent
+--- config
+    location /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            local ok, err = ngx.on_abort(function ()
+                ngx.log(ngx.NOTICE, "on abort called")
+                ngx.exit(408)
+            end)
+
+            if not ok then
+                error("cannot set on_abort: " .. err)
+            end
+
+            ngx.send_headers()
+            ngx.sleep(0.7)
+            ngx.log(ngx.NOTICE, "main handler done")
+        ';
+    }
+--- request
+GET /t
+
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+lua check broken conn
+terminate 2: ok
+lua req cleanup
+delete thread 2
+delete thread 1
+
+--- timeout: 0.2
+--- abort
+--- ignore_response
+--- no_error_log
+[error]
+main handler done
+--- error_log
+client prematurely closed connection
+on abort called
+
+
+
+=== TEST 17: GC issue with the on_abort thread object
+--- config
+    location = /t {
+        lua_check_client_abort on;
+        content_by_lua '
+            ngx.on_abort(function () end)
+            collectgarbage()
+            ngx.sleep(60)
+        ';
+    }
+--- request
+    GET /t
+--- abort
+--- timeout: 0.2
+--- ignore_response
+--- no_error_log
+[error]
+[alert]
+
diff --git a/debian/modules/nginx-lua/t/102-req-start-time.t b/debian/modules/nginx-lua/t/102-req-start-time.t
new file mode 100644
index 0000000..8f3110b
--- /dev/null
+++ b/debian/modules/nginx-lua/t/102-req-start-time.t
@@ -0,0 +1,117 @@
+# -*- mode: conf -*-
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: start time
+--- config
+    location = /start {
+        content_by_lua 'ngx.say(ngx.req.start_time())';
+    }
+--- request
+GET /start
+--- response_body_like: ^\d{10,}(\.\d+)?$
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: start time in set_by_lua
+--- config
+    location = /start {
+        set_by_lua $a 'return ngx.req.start_time()';
+        echo $a;
+    }
+--- request
+GET /start
+--- response_body_like: ^\d{10,}(\.\d+)?$
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: request time
+--- config
+    location = /req_time {
+        content_by_lua '
+            ngx.sleep(0.1)
+
+            local req_time = ngx.now() - ngx.req.start_time()
+
+            ngx.say(req_time)
+            ngx.say(ngx.req.start_time() < ngx.now())
+        ';
+    }
+--- request
+GET /req_time
+--- response_body_like chop
+^(?:0\.[12]|0\.099)\d*
+true$
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: request time update
+--- config
+    location = /req_time {
+            content_by_lua '
+               ngx.sleep(0.1)
+
+               local req_time = ngx.now() - ngx.req.start_time()
+
+               ngx.sleep(0.1)
+
+               ngx.update_time()
+
+               local req_time_updated = ngx.now() - ngx.req.start_time()
+
+               ngx.say(req_time)
+               ngx.say(req_time_updated)
+               ngx.say(req_time_updated > req_time)
+            ';
+    }
+--- request
+GET /req_time
+--- response_body_like chomp
+^(?:0\.[12]|0\.099)\d*
+0\.\d+
+true$
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: init_by_lua
+--- http_config
+    init_by_lua '
+        time = ngx.req.start_time()
+    ';
+--- config
+    location = /t {
+        content_by_lua '
+            ngx.say(time)
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+--- no_error_log
+[error]
+--- SKIP
+
diff --git a/debian/modules/nginx-lua/t/StapThread.pm b/debian/modules/nginx-lua/t/StapThread.pm
new file mode 100644
index 0000000..dd433d3
--- /dev/null
+++ b/debian/modules/nginx-lua/t/StapThread.pm
@@ -0,0 +1,275 @@
+package t::StapThread;
+
+use strict;
+use warnings;
+
+our $GCScript = <<'_EOC_';
+global ids, cur
+global in_req = 0
+global alive_reqs
+
+function gen_id(k) {
+    if (ids[k]) return ids[k]
+    ids[k] = ++cur
+    return cur
+}
+
+F(ngx_http_handler) {
+    if (!alive_reqs[$r] && $r == $r->main) {
+        in_req++
+        alive_reqs[$r] = 1
+
+        if (in_req == 1) {
+            delete ids
+            cur = 0
+        }
+    }
+}
+
+F(ngx_http_free_request) {
+    if (alive_reqs[$r]) {
+        in_req--
+        delete alive_reqs[$r]
+    }
+}
+
+F(ngx_http_terminate_request) {
+    if (alive_reqs[$r]) {
+        in_req--
+        delete alive_reqs[$r]
+    }
+}
+
+M(http-lua-user-thread-spawn) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("spawn user thread %x in %x\n", c, p)
+}
+
+M(http-lua-thread-delete) {
+    t = gen_id($arg2)
+    printf("delete thread %x\n", t)
+}
+
+M(http-lua-user-coroutine-create) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("create %x in %x\n", c, p)
+}
+
+M(http-lua-coroutine-done) {
+    t = gen_id($arg2)
+    printf("terminate %d: %s\n", t, $arg3 ? "ok" : "fail")
+    #print_ubacktrace()
+}
+
+_EOC_
+
+our $StapScript = <<'_EOC_';
+global ids, cur
+global timers
+global in_req = 0
+global co_status
+global alive_reqs
+
+function gen_id(k) {
+    if (ids[k]) return ids[k]
+    ids[k] = ++cur
+    return cur
+}
+
+F(ngx_http_handler) {
+    if (!alive_reqs[$r] && $r == $r->main) {
+        in_req++
+        alive_reqs[$r] = 1
+
+        printf("in req: %d\n", in_req)
+
+        if (in_req == 1) {
+            delete ids
+            cur = 0
+            co_status[0] = "running"
+            co_status[1] = "suspended"
+            co_status[2] = "normal"
+            co_status[3] = "dead"
+        }
+    }
+}
+
+F(ngx_http_free_request) {
+    if (alive_reqs[$r]) {
+        in_req--
+        println("free request")
+        delete alive_reqs[$r]
+    }
+}
+
+F(ngx_http_terminate_request) {
+    if (alive_reqs[$r]) {
+        in_req--
+        println("terminate request")
+        delete alive_reqs[$r]
+    }
+}
+
+F(ngx_http_lua_post_thread) {
+    id = gen_id($coctx->co)
+    printf("post thread %d\n", id)
+}
+
+M(timer-add) {
+    timers[$arg1] = $arg2
+    printf("add timer %d\n", $arg2)
+}
+
+M(timer-del) {
+    printf("delete timer %d\n", timers[$arg1])
+    delete timers[$arg1]
+}
+
+M(timer-expire) {
+    printf("expire timer %d\n", timers[$arg1])
+    delete timers[$arg1]
+}
+
+F(ngx_http_lua_sleep_handler) {
+    printf("sleep handler called\n")
+}
+
+F(ngx_http_lua_run_thread) {
+    id = gen_id($ctx->cur_co_ctx->co)
+    printf("run thread %d\n", id)
+    #if (id == 1) {
+        #print_ubacktrace()
+    #}
+}
+
+probe process("/usr/local/openresty-debug/luajit/lib/libluajit-5.1.so.2").function("lua_resume") {
+    id = gen_id($L)
+    printf("lua resume %d\n", id)
+}
+
+M(http-lua-user-thread-spawn) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("spawn uthread %x in %x\n", c, p)
+}
+
+M(http-lua-thread-delete) {
+    t = gen_id($arg2)
+    uthreads = @cast($arg3, "ngx_http_lua_ctx_t")->uthreads
+    printf("delete thread %x (uthreads %d)\n", t, uthreads)
+    #print_ubacktrace()
+}
+
+M(http-lua-run-posted-thread) {
+    t = gen_id($arg2)
+    printf("run posted thread %d (status %s)\n", t, co_status[$arg3])
+}
+
+M(http-lua-user-coroutine-resume) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("resume %x in %x\n", c, p)
+}
+
+M(http-lua-thread-yield) {
+    t = gen_id($arg2)
+    printf("thread %d yield\n", t)
+}
+
+/*
+F(ngx_http_lua_coroutine_yield) {
+    printf("yield %x\n", gen_id($L))
+}
+*/
+
+M(http-lua-user-coroutine-yield) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("yield %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_atpanic) {
+    printf("lua atpanic(%d):", gen_id($L))
+    print_ubacktrace();
+}
+
+F(ngx_http_lua_run_posted_threads) {
+    printf("run posted threads\n")
+}
+
+F(ngx_http_finalize_request) {
+    printf("finalize request %s: rc:%d c:%d a:%d\n", ngx_http_req_uri($r), $rc, $r->main->count, $r == $r->main);
+    #if ($rc == -1) {
+        #print_ubacktrace()
+    #}
+}
+F(ngx_http_lua_post_subrequest) {
+    printf("post subreq: %s rc=%d, status=%d a=%d\n", ngx_http_req_uri($r), $rc,
+         $r->headers_out->status, $r == $r->main)
+    #print_ubacktrace()
+}
+M(http-subrequest-done) {
+    printf("subrequest %s done\n", ngx_http_req_uri($r))
+}
+M(http-subrequest-wake-parent) {
+    printf("subrequest wake parent %s\n", ngx_http_req_uri($r->parent))
+}
+M(http-lua-user-coroutine-create) {
+    p = gen_id($arg2)
+    c = gen_id($arg3)
+    printf("create %x in %x\n", c, p)
+}
+
+F(ngx_http_lua_ngx_exec) { println("exec") }
+
+F(ngx_http_lua_ngx_exit) { println("exit") }
+
+F(ngx_http_lua_req_body_cleanup) {
+    println("lua req body cleanup")
+}
+
+F(ngx_http_read_client_request_body) {
+    println("read client request body")
+}
+
+F(ngx_http_lua_finalize_coroutines) {
+    println("finalize coroutines")
+}
+
+F(ngx_http_lua_ngx_exit) {
+    println("ngx.exit() called")
+}
+
+F(ngx_http_lua_sleep_resume) {
+    println("lua sleep resume")
+}
+
+M(http-lua-coroutine-done) {
+    t = gen_id($arg2)
+    printf("terminate coro %d: %s, waited by parent:%d, child cocotx: %p\n", t, $arg3 ? "ok" : "fail", $ctx->cur_co_ctx->waited_by_parent, $ctx->cur_co_ctx)
+    //print_ubacktrace()
+}
+
+F(ngx_http_lua_ngx_echo) {
+    println("ngx.print or ngx.say")
+}
+
+F(ngx_http_lua_del_all_threads) {
+    println("del all threads")
+}
+
+M(http-lua-info) {
+    msg = user_string($arg1)
+    printf("lua info: %s\n", msg)
+}
+
+M(http-lua-user-thread-wait) {
+    p = gen_id($arg1)
+    c = gen_id($arg2)
+    printf("lua thread %d waiting on %d, child coctx: %p\n", p, c, $sub_coctx)
+}
+_EOC_
+
+1;
diff --git a/debian/modules/nginx-lua/tapset/ngx_lua.stp b/debian/modules/nginx-lua/tapset/ngx_lua.stp
new file mode 100644
index 0000000..04fecb5
--- /dev/null
+++ b/debian/modules/nginx-lua/tapset/ngx_lua.stp
@@ -0,0 +1,5 @@
+function ngx_http_lua_ctx_context(r)
+{
+
+}
+
diff --git a/debian/modules/nginx-lua/util/build2.sh b/debian/modules/nginx-lua/util/build2.sh
index e442199..13a5fa8 100755
--- a/debian/modules/nginx-lua/util/build2.sh
+++ b/debian/modules/nginx-lua/util/build2.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # this file is mostly meant to be used by the author himself.
 
 root=`pwd`
-version=${1:-1.0.5}
+version=${1:-1.2.1}
 home=~
 force=$2
 
@@ -23,7 +23,7 @@ time ngx-build $force $version \
         --with-http_ssl_module \
             --add-module=$root/../ndk-nginx-module \
             --add-module=$root/../set-misc-nginx-module \
-            --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:/opt/drizzle/lib:/home/lz/lib:/usr/local/openresty-debug/luajit/lib:/usr/local/lib" \
+            --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$LUAJIT_LIB:/usr/local/lib" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \
@@ -43,6 +43,7 @@ time ngx-build $force $version \
                 --add-module=$home/work/nginx/ngx_http_upstream_keepalive-0.7 \
                 --add-module=$root/../rds-json-nginx-module \
                 --add-module=$root/../coolkit-nginx-module \
+                --add-module=$root/../redis2-nginx-module \
           --with-select_module \
           --with-poll_module \
           --with-rtsig_module \
diff --git a/debian/modules/nginx-lua/util/gdbinit b/debian/modules/nginx-lua/util/gdbinit
index 741f0d9..1508c64 100644
--- a/debian/modules/nginx-lua/util/gdbinit
+++ b/debian/modules/nginx-lua/util/gdbinit
@@ -1,6 +1,8 @@
 # This gdb script provides several useful routines for debugging ngx_lua or
 # standalone Lua/LuaJIT.
 #
+# You need gdb >= v7.3 to make this script working correctly.
+#
 # Installation: place it at $HOME/.gdbinit
 #
 # -- chaoslawful <at> gmail <dot> com
@@ -390,5 +392,24 @@ document lr
 lr <lua state>: Dump all entries in Lua registry table.
 end
 
+define ls
+	if $argc != 1
+		echo Please specify Lua state!\n
+	else
+		set $l = (lua_State*)$arg0
+		set $idx = lua_gettop($l)
+		while $idx >= 1
+			printf "#%d ", $idx
+			__lua_dump_stack $l $idx
+			printf "\n"
+			set $idx = $idx - 1
+		end
+	end
+end
+
+document ls
+ls <lua state>: Dump all entries in call stack.
+end
+
 # vi:ft=gdb ts=4 sw=4
 
diff --git a/debian/modules/nginx-lua/valgrind.suppress b/debian/modules/nginx-lua/valgrind.suppress
index 2b9134e..9420ed2 100644
--- a/debian/modules/nginx-lua/valgrind.suppress
+++ b/debian/modules/nginx-lua/valgrind.suppress
@@ -1,3 +1,24 @@
+{
+<insert_a_suppression_name_here>
+Memcheck:Leak
+fun:malloc
+fun:ngx_alloc
+}
+{
+<insert_a_suppression_name_here>
+Memcheck:Addr1
+fun:ngx_init_cycle
+fun:ngx_master_process_cycle
+fun:main
+}
+{
+<insert_a_suppression_name_here>
+Memcheck:Addr4
+fun:ngx_init_cycle
+fun:ngx_master_process_cycle
+fun:main
+}
+
 {
    <insert_a_suppression_name_here>
    Memcheck:Cond
@@ -27,8 +48,6 @@ fun:ngx_http_lua_ngx_echo
    fun:ngx_event_accept
    fun:ngx_epoll_process_events
    fun:ngx_process_events_and_timers
-   fun:ngx_single_process_cycle
-   fun:main
 }
 {
    <insert_a_suppression_name_here>
@@ -39,28 +58,6 @@ fun:ngx_http_lua_ngx_echo
    fun:ngx_event_accept
    fun:ngx_epoll_process_events
    fun:ngx_process_events_and_timers
-   fun:ngx_single_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   write(buf)
-   fun:__write_nocancel
-   fun:ngx_log_error_core
-   fun:ngx_resolver_read_response
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:ngx_sprintf_num
-   fun:ngx_vslprintf
-   fun:ngx_log_error_core
-   fun:ngx_resolver_read_response
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_single_process_cycle
-   fun:main
 }
 {
    <insert_a_suppression_name_here>
@@ -70,30 +67,6 @@ fun:ngx_http_lua_ngx_echo
    fun:ngx_sock_ntop
    fun:ngx_event_accept
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   write(buf)
-   fun:__write_nocancel
-   fun:ngx_log_error_core
-   fun:ngx_resolver_read_response
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_single_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:ngx_sprintf_num
-   fun:ngx_vslprintf
-   fun:ngx_log_error_core
-   fun:ngx_resolver_read_response
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_single_process_cycle
-   fun:main
-}
 {
    <insert_a_suppression_name_here>
    exp-sgcheck:SorG
@@ -392,16 +365,6 @@ fun:ngx_http_lua_ngx_echo
    fun:ngx_master_process_cycle
    fun:main
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   socketcall.sendmsg(msg.msg_iov[i])
-   fun:__sendmsg_nocancel
-   fun:ngx_write_channel
-   fun:ngx_signal_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Leak
@@ -583,4 +546,3 @@ fun:ngx_http_lua_ngx_echo
    fun:ngx_palloc_block
    fun:ngx_palloc
 }
-